r45232 - in /packages/libgtkdatabox/trunk/debian: changelog control rules

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Jul 12 07:28:11 2012
New Revision: 45232

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45232
Log:
Switch from cdbs to dh; fix clean target; some other slight changes

Modified:
    packages/libgtkdatabox/trunk/debian/changelog
    packages/libgtkdatabox/trunk/debian/control
    packages/libgtkdatabox/trunk/debian/rules

Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=45232&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Thu Jul 12 07:28:11 2012
@@ -9,7 +9,14 @@
   * debian/control:
      - Standards-Version: 3.9.3
      - Updated versioned package names
+     - Fixed Vcs fields
+     - Dropped Build-Depends cdbs, quilt
   * debhelper 9 (control+compat)
+  * debian/rules:
+     - cdbs -> dh
+     - enable building twice in a row by creating a copy of original
+       docs/reference which differs drastically from the doc created
+       in the build process
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Jul 2012 15:02:19 +0200
 

Modified: packages/libgtkdatabox/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/control?rev=45232&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/control (original)
+++ packages/libgtkdatabox/trunk/debian/control Thu Jul 12 07:28:11 2012
@@ -5,12 +5,12 @@
 DM-Upload-Allowed: yes
 Uploaders: Ramakrishnan Muthukrishnan <rkrishnan at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, autotools-dev, d-shlibs (>= 0.40),
+Build-Depends: debhelper (>= 9), autotools-dev, d-shlibs (>= 0.40),
  libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev, gtk-doc-tools,
- libglade2-dev, libgladeui-1-dev, quilt
+ libglade2-dev, libgladeui-1-dev
 Standards-Version: 3.9.3
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libgtkdatabox/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/libgtkdatabox/trunk/
 Homepage: http://sourceforge.net/projects/gtkdatabox
 
 Package: libgtkdatabox-0.9.1-3-dev

Modified: packages/libgtkdatabox/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/rules?rev=45232&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/rules (original)
+++ packages/libgtkdatabox/trunk/debian/rules Thu Jul 12 07:28:11 2012
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
-# rules file for gtkdatabox using cdbs
+# rules file for gtkdatabox using dh
 # Andreas Tille <tille at debian.org>
 # License: GPL
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
 
 pkg=$(shell grep -v -- "-dev" debian/control | sed -n 's/^Package: \+\([^-]\+\)-.*/\1/p' | head -n 1)
 devpkg=$(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' | head -n 1)
 
 ver  := $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/^Version: [0-9]\+:\(.*\)/\1/')
+
+%:
+	dh $@ --with autotools_dev
 
 DEB_INSTALL_DOCS_ALL := AUTHORS README
 
@@ -19,12 +21,18 @@
 			--enable-glade \
 			--enable-gtk-doc
 
-DEB_COMPRESS_EXCLUDE := .devhelp
+override_dh_auto_configure:
+	cp -a docs/reference docs/reference.orig
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
-common-binary-post-install-arch::
+override_dh_compress:
+	dh_compress --exclude=.devhelp
+
+override_dh_install:
+	dh_install
 	# Call d-shlibmove to comply with library packaging guide
 	d-devlibdeps debian/$(devpkg).substvars \
-	             debian/tmp/usr/lib/$(pkg).so
+	             debian/tmp/usr/lib/*/$(pkg).so
 
 	# Do not use debian/$(devpkg).examples as debhelper input because
 	# you always have to adapt the file name when a new version pops up
@@ -34,13 +42,20 @@
 
 	d-shlibmove --commit \
 		    --movedev "debian/tmp/usr/include" usr \
-		    --movedev "debian/tmp/usr/lib/pkgconfig" usr/share \
+		    --movedev "debian/tmp/usr/lib/*/pkgconfig" usr/share \
 		    --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/libgtkdatabox-$(ver)-dev/html \
-		    debian/tmp/usr/lib/$(pkg).so
+		    debian/tmp/usr/lib/*/$(pkg).so
 	rm `find debian -name '*.la'`
 
+override_dh_installdocs:
+	dh_installdocs $(DEB_INSTALL_DOCS_ALL)
+
+override_dh_auto_clean:
+	dh_auto_clean
+	if [ -d docs/reference.orig ] ; then \
+	    rm -rf docs/reference ; \
+	    mv docs/reference.orig docs/reference ; \
+	fi
+
 get-orig-source:
-	uscan
-
-clean::
-	rm -f debian/$(devpkg).substvars debian/*.log
+	uscan --verbose --force-download