[maemo-commits] [maemo-commits] r13886 - projects/haf/trunk/gtk+/debian

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-18 14:26:51 +0300 (Tue, 18 Sep 2007)
New Revision: 13886

Modified:
   projects/haf/trunk/gtk+/debian/changelog
   projects/haf/trunk/gtk+/debian/control
   projects/haf/trunk/gtk+/debian/control.in
   projects/haf/trunk/gtk+/debian/rules
Log:
--enable-gtk-doc

  * debian/control.in:
  * debian/control: Add glib, atk, pango and cairo doc packages to build
    dependencies to get gtk-doc crossreferences right
  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
    (Fixes: NB#69304)


Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog	2007-09-18 11:07:16 UTC (rev 13885)
+++ projects/haf/trunk/gtk+/debian/changelog	2007-09-18 11:26:51 UTC (rev 13886)
@@ -1,3 +1,15 @@
+gtk+2.0 (2:2.10.12-0osso17) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+  * debian/control.in:
+  * debian/control: Add glib, atk, pango and cairo doc packages to build
+    dependencies to get gtk-doc crossreferences right
+  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
+    (Fixes: NB#69304)
+
+ -- Tommi Komulainen <tommi.komulainen at nokia.com>  Tue, 18 Sep 2007 14:26:10 +0300
+
 gtk+2.0 (2:2.10.12-0osso16) unstable; urgency=low
 
   * Use the reintroduced GScanner cache. Addresses NB#61907

Modified: projects/haf/trunk/gtk+/debian/control
===================================================================
--- projects/haf/trunk/gtk+/debian/control	2007-09-18 11:07:16 UTC (rev 13885)
+++ projects/haf/trunk/gtk+/debian/control	2007-09-18 11:26:51 UTC (rev 13886)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Xan Lopez <xan.lopez at nokia.com>
 Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.12.12-1osso2), libpango1.0-dev (>= 1.12.0), libatk1.0-dev (>= 1.9.0), libcairo2-dev (>= 1.2.0), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev,  libjpeg62-dev, libpng12-dev, gtk-doc-tools, libtiff4-dev, libexpat1-dev, libxfixes-dev, libtool (>= 1.5.12), libxtst-dev
-Build-Depends-Indep: gtk-doc-tools
+Build-Depends-Indep: gtk-doc-tools, libglib2.0-doc, libpango1.0-doc, libatk1.0-doc, libcairo2-doc
 Standards-Version: 3.6.1.0
 
 Package: libgtk2.0-0

Modified: projects/haf/trunk/gtk+/debian/control.in
===================================================================
--- projects/haf/trunk/gtk+/debian/control.in	2007-09-18 11:07:16 UTC (rev 13885)
+++ projects/haf/trunk/gtk+/debian/control.in	2007-09-18 11:26:51 UTC (rev 13886)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Xan Lopez <xan.lopez at nokia.com>
 Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.12.12-1osso2), libpango1.0-dev (>= 1.12.0), libatk1.0-dev (>= 1.9.0), libcairo2-dev (>= 1.2.0), libx11-dev, libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev,  libjpeg62-dev, libpng12-dev, gtk-doc-tools, libtiff4-dev, libexpat1-dev, libxfixes-dev, libtool (>= 1.5.12), libxtst-dev
-Build-Depends-Indep: gtk-doc-tools
+Build-Depends-Indep: gtk-doc-tools, libglib2.0-doc, libpango1.0-doc, libatk1.0-doc, libcairo2-doc
 Standards-Version: 3.6.1.0
 
 Package: libgtk2.0- at SONAME@

Modified: projects/haf/trunk/gtk+/debian/rules
===================================================================
--- projects/haf/trunk/gtk+/debian/rules	2007-09-18 11:07:16 UTC (rev 13885)
+++ projects/haf/trunk/gtk+/debian/rules	2007-09-18 11:26:51 UTC (rev 13886)
@@ -35,6 +35,12 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+ENABLE_GTK_DOC = --enable-gtk-doc
+else
+ENABLE_GTK_DOC = --disable-gtk-doc
+endif
+
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
     PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
         sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
@@ -100,7 +106,7 @@
 			--enable-shared \
 			--disable-static \
 			--disable-dependency-tracking \
-			--disable-gtk-doc
+			$(ENABLE_GTK_DOC)
 
 	cd $(BUILD_SHARED_DIR) && \
 	sed < libtool > libtool-2 \