[maemo-commits] [maemo-commits] r10671 - projects/haf/branches/hildon-libs/hildon-1/debian

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-03-21 10:22:10 +0200 (Wed, 21 Mar 2007)
New Revision: 10671

Removed:
   projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.docs
Modified:
   projects/haf/branches/hildon-libs/hildon-1/debian/changelog
   projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.install
   projects/haf/branches/hildon-libs/hildon-1/debian/rules
Log:
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


Modified: projects/haf/branches/hildon-libs/hildon-1/debian/changelog
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/debian/changelog	2007-03-21 08:03:54 UTC (rev 10670)
+++ projects/haf/branches/hildon-libs/hildon-1/debian/changelog	2007-03-21 08:22:10 UTC (rev 10671)
@@ -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 at nokia.com>  Wed, 21 Mar 2007 10:13:47 +0200
+
 libhildon (0.9.9-11) unstable; urgency=low
 
   * Unreleased.

Deleted: projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.docs
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.docs	2007-03-21 08:03:54 UTC (rev 10670)
+++ projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.docs	2007-03-21 08:22:10 UTC (rev 10671)
@@ -1 +0,0 @@
-debian/build/usr/share/gtk-doc/html

Modified: projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.install
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.install	2007-03-21 08:03:54 UTC (rev 10670)
+++ projects/haf/branches/hildon-libs/hildon-1/debian/libhildon1-dev.install	2007-03-21 08:22:10 UTC (rev 10671)
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*.so
 usr/lib/pkgconfig
+usr/share/gtk-doc/html

Modified: projects/haf/branches/hildon-libs/hildon-1/debian/rules
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/debian/rules	2007-03-21 08:03:54 UTC (rev 10670)
+++ projects/haf/branches/hildon-libs/hildon-1/debian/rules	2007-03-21 08:22:10 UTC (rev 10671)
@@ -107,14 +107,16 @@
 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"