[SCM] Debian packaging for libhildon. branch, debian, updated. debian/2.1.34.debian.1-3-3-g3810e1b

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit bed18ff4929c2ee92e7de2ba7728e2c22cb26fd7
Author: Jonny Lamb <jonny at debian.org>
Date:   Tue Aug 11 16:48:51 2009 +0100

    Add -doc package.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index a731dde..7768d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libhildon (2.1.34.debian.1-4) UNRELEASED; urgency=low
+
+  * Add -doc package.
+
+ -- Jonny Lamb <jonny at debian.org>  Tue, 11 Aug 2009 16:48:31 +0100
+
 libhildon (2.1.34.debian.1-3) unstable; urgency=low
 
   [ Riku Voipio ]
diff --git a/debian/control b/debian/control
index e134ba5..a341e0f 100644
--- a/debian/control
+++ b/debian/control
@@ -65,3 +65,16 @@ Description: Hildon libraries - detached debug symbols
  tied with hildon-theme-plankton.
  .
  This package contains the detached debug symbols.
+
+Package: libhildon-1-doc
+Section: doc
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}
+Description: Hildon libraries - API documentation
+ Hildon is the widget library for maemo. It contains a
+ generic application window as well as several specialized
+ widgets designed for internet tablets. It is very closely
+ tied with hildon-theme-plankton.
+ .
+ This package contains the API documentation.
diff --git a/debian/libhildon-1-doc.install b/debian/libhildon-1-doc.install
new file mode 100644
index 0000000..9f37ff2
--- /dev/null
+++ b/debian/libhildon-1-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/hildon
diff --git a/debian/libhildon-1-doc.links b/debian/libhildon-1-doc.links
new file mode 100644
index 0000000..55b4545
--- /dev/null
+++ b/debian/libhildon-1-doc.links
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/hildon usr/share/doc/libhildon-1-doc/hildon
diff --git a/debian/rules b/debian/rules
index 25b3173..abf7add 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ configure_flags := \
 		--infodir=\$${prefix}/share/info     \
 		--with-doc-dir=\$${prefix}/share/doc \
 		--disable-dependency-tracking        \
-		--disable-gtk-doc                    \
+		--enable-gtk-doc                    \
 		--without-maemo-gtk
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@ -115,13 +115,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installdocs
 	dh_installchangelogs
-	@if [ -d debian/build/usr/share/gtk-doc ]; then		\
-	  echo "Installing gtk-doc" ;				\
-	  dh_install --sourcedir=debian/tmp -v ;		\
-	else 							\
-	  echo "Skipping gtk-doc" ;				\
-	  dh_install --sourcedir=debian/tmp -v -Xgtk-doc ;	\
-	fi
+	dh_install --sourcedir=debian/tmp
 	dh_installman
 	dh_link
 	dh_strip --dbg-package="libhildon-1-0-dbg"

-- 
Debian packaging for libhildon.