[maemo-commits] [maemo-commits] r14535 - projects/haf/trunk/hildon-desktop/debian

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-10-19 15:39:33 +0300 (Fri, 19 Oct 2007)
New Revision: 14535

Added:
   projects/haf/trunk/hildon-desktop/debian/libhildondesktop0-doc.install
Modified:
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/control
   projects/haf/trunk/hildon-desktop/debian/rules
Log:

hildon-desktop (1:2.0.1-2) sardine; urgency=low

  * debian/control:
    . added libhildondesktop0-doc
    . added Build-Depends-Indep to gtk-doc-tools
  * debian/rules:
    . enable gtk-doc
    . add a symlink from /usr/share/gtk-doc/html
  * debian/libhildondesktop0-doc.install: added



Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-10-19 12:26:26 UTC (rev 14534)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-10-19 12:39:33 UTC (rev 14535)
@@ -1,3 +1,15 @@
+hildon-desktop (1:2.0.1-2) sardine; urgency=low
+
+  * debian/control:
+    . added libhildondesktop0-doc
+    . added Build-Depends-Indep to gtk-doc-tools
+  * debian/rules:
+    . enable gtk-doc
+    . add a symlink from /usr/share/gtk-doc/html
+  * debian/libhildondesktop0-doc.install: added
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Fri, 19 Oct 2007 15:37:33 +0300
+
 hildon-desktop (1:2.0.1-1) sardine; urgency=low
 
   * src/hd-switcher-menu.c

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2007-10-19 12:26:26 UTC (rev 14534)
+++ projects/haf/trunk/hildon-desktop/debian/control	2007-10-19 12:39:33 UTC (rev 14535)
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
 Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev | hildon-fm-dev, libhildonhelp-dev | libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, libxdamage-dev, libxcomposite-dev, libsqlite3-dev, mce-dev, gtk-doc-tools, maemo-launcher-dev (>= 0.23-1)
+Build-Depends-Indep: gtk-doc-tools
 Standards-Version: 3.6.0
 
 Package: hildon-desktop
@@ -41,6 +42,7 @@
 Package: libhildondesktop-dev
 Section: devel
 Architecture: all
+Suggests: libhildondesktop0-doc
 Depends: ${shlibs:Depends}, ${misc:Depends}, libhildondesktop0 (=${Source-Version}), libhildon1-dev | hildon-libs-dev, libxml2-dev
 Description: libhildondesktop development files
   Development headers and static libraries for the libhildondesktop
@@ -52,6 +54,14 @@
 Description: libhildondesktop debug symbols
   Debugging symbols for libhildondesktop0
 
+Package: libhildondesktop0-doc
+Section: doc
+Architecture: all
+Depends: lynx | www-browser
+Suggests: libgtk2.0-doc
+Description: documentation for libhildondesktop
+  Documentation for libhildondesktop, aimed at plugin writers.
+
 Package: libhildonwm0
 Section: libs
 Architecture: any

Added: projects/haf/trunk/hildon-desktop/debian/libhildondesktop0-doc.install
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/libhildondesktop0-doc.install	2007-10-19 12:26:26 UTC (rev 14534)
+++ projects/haf/trunk/hildon-desktop/debian/libhildondesktop0-doc.install	2007-10-19 12:39:33 UTC (rev 14535)
@@ -0,0 +1 @@
+usr/share/doc/libhildondesktop0-doc/*

Modified: projects/haf/trunk/hildon-desktop/debian/rules
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/rules	2007-10-19 12:26:26 UTC (rev 14534)
+++ projects/haf/trunk/hildon-desktop/debian/rules	2007-10-19 12:39:33 UTC (rev 14535)
@@ -41,6 +41,12 @@
 	CFLAGS += -ggdb -DDEBUG
 endif
 
+ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+ENABLE_GTK_DOC = --enable-gtk-doc
+else
+ENABLE_GTK_DOC = --disable-gtk-doc
+endif
+
 # shared library versions, option 1
 version=0.0.0
 major=0
@@ -53,7 +59,7 @@
 config.status: configure
 	dh_testdir
 # Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-dependency-tracking --enable-safe-mode
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-dependency-tracking --enable-safe-mode --with-html-dir=\$${prefix}/share/doc/libhildondesktop0-doc $(ENABLE_GTK_DOC)
 
 
 build: build-stamp
@@ -106,8 +112,11 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	dh_link -plibhildondesktop0-doc			\
+		usr/share/doc/libhildondesktop0-doc/hildon-desktop	\
+		usr/share/gtk-doc/html/hildon-desktop;		\
 
+
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir