Fix gtk-doc packaging

libhildon (0.9.9-12) UNRELEASED; urgency=low

  [ Tommi Komulainen ]
  * Fix packaging for gtk-doc (not enabled by default)
    - debian/libhildon1-dev.docs: Removed
    - debian/libhildon1-dev.install: Added the gtk-doc directory here
    - debian/rules: replace broken conditional dh_installdocs with dh_install
      that excludes gtk-doc if the docs aren't installed
    - debian/rules: unconditionally call dh_installdocs to include copyright

diff --git a/debian/changelog b/debian/changelog
index 175777c..61a902b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libhildon (0.9.9-12) UNRELEASED; urgency=low
+
+  [ Tommi Komulainen ]
+  * Fix packaging for gtk-doc (not enabled by default)
+    - debian/libhildon1-dev.docs: Removed
+    - debian/libhildon1-dev.install: Added the gtk-doc directory here
+    - debian/rules: replace broken conditional dh_installdocs with dh_install
+      that excludes gtk-doc if the docs aren't installed
+    - debian/rules: unconditionally call dh_installdocs to include copyright
+
+ -- Tommi Komulainen <tommi.komulainen@nokia.com>  Wed, 21 Mar 2007 10:13:47 +0200
+
 libhildon (0.9.9-11) unstable; urgency=low
 
   * Unreleased.

diff --git a/debian/libhildon1-dev.docs b/debian/libhildon1-dev.docs
deleted file mode 100644 (file)
index 52e24a4..0000000
--- a/debian/libhildon1-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/build/usr/share/gtk-doc/html

diff --git a/debian/libhildon1-dev.install b/debian/libhildon1-dev.install
index 9d4598d..e6171ae 100644 (file)
--- a/debian/libhildon1-dev.install
+++ b/debian/libhildon1-dev.install
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*.so
 usr/lib/pkgconfig
+usr/share/gtk-doc/html

diff --git a/debian/rules b/debian/rules
index 674e811..5f46a9c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -107,14 +107,16 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
+       dh_installdocs
        dh_installchangelogs 
 #      dh_installexamples
-       @if [ "x$(ENABLE_GTK_DOC)" != "x" ]; then \
-           dh_installdocs;                       \
-       else                                      \
-           echo "oh nooooooo, no gtk-doc :(";    \
+       @if [ -d debian/build/usr/share/gtk-doc ]; then         \
+         echo "Installing gtk-doc" ;                           \
+         dh_install --sourcedir=debian/build -v ;              \
+       else                                                    \
+         echo "Skipping gtk-doc" ;                             \
+         dh_install --sourcedir=debian/build -v -Xgtk-doc ;    \
        fi
-       dh_install --sourcedir=debian/build -v
        dh_installman
        dh_link
        dh_strip --dbg-package="libhildon1"