--enable-gtk-doc

* debian/control: Add glib and gtk+ doc packages to build dependencies to
    get gtk-doc crossreferences right
  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
    (Fixes: NB#69306)

diff --git a/debian/changelog b/debian/changelog
index 29a5325..01fe974 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libhildon (1.0.14-1.1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+  * debian/control: Add glib and gtk+ doc packages to build dependencies to
+    get gtk-doc crossreferences right
+  * debian/rules: --enable-gtk-doc (with nodocs DEB_BUILD_OPTIONS support)
+    (Fixes: NB#69306)
+
+ -- Tommi Komulainen <tommi.komulainen@nokia.com>  Fri, 14 Sep 2007 16:50:47 +0300
+
 libhildon (1.0.14-1) stable; urgency=low
 
   * Removing the patch for hiding HildonWindow before destroy. Breaks DBus.

diff --git a/debian/control b/debian/control
index 50e5d0a..55cb00f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libhildon
 Section: x11
 Priority: optional
 Maintainer: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.10), libesd0-dev | osso-esd-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.10), libesd0-dev | osso-esd-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools, libgtk2.0-doc, libglib2.0-doc
 Standards-Version: 3.6.0
 
 Package: libhildon1-dev

diff --git a/debian/rules b/debian/rules
index 6792466..680f435 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,12 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -mthumb
 endif
 
+ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+ENABLE_GTK_DOC = --enable-gtk-doc
+else
+ENABLE_GTK_DOC = --disable-gtk-doc
+endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
@@ -52,7 +58,7 @@ config.status: $(SOURCE_DIR)/configure
                --infodir=\$${prefix}/share/info     \
                --with-doc-dir=\$${prefix}/share/doc \
                --disable-dependency-tracking        \
-               --disable-gtk-doc
+              $(ENABLE_GTK_DOC)
 
 $(SOURCE_DIR)/configure:
        AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes $(SOURCE_DIR)/autogen.sh