debian: Use dh to build, and support multiarch

20 files changed, 61 insertions, 110 deletions

diff --git a/debian/changelog b/debian/changelog
index ff0dd10..a86ddb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ gutenprint (5.2.7-1) unstable; urgency=low
   * New upstream stable release.
   * Upgrade to Standards Version 3.9.2 (no changes).
   * Drop inactive maintainers from Uploaders.
+  * Use dh from debhelper for building.
+  * Use multiarch paths.
 
- -- Roger Leigh <rleigh@debian.org>  Tue, 03 May 2011 10:43:09 +0100
+ -- Roger Leigh <rleigh@debian.org>  Sat, 23 Jul 2011 13:03:48 +0100
 
 gutenprint (5.2.6-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 49dc16d..4111b39 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Roger Leigh <rleigh@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: libcups2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline-dev, libijs-dev, debhelper (>= 7.0.0), zlib1g-dev, flex, gettext, foomatic-db-engine, chrpath, quilt
+Build-Depends: libcups2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline-dev, libijs-dev, debhelper (>= 8.1.0), zlib1g-dev, flex, gettext, foomatic-db-engine, chrpath, quilt
 Vcs-Browser: http://git.debian.org/?p=collab-maint/gutenprint.git
 Vcs-Git: git://git.debian.org/git/collab-maint/gutenprint
 
diff --git a/debian/cups-driver-gutenprint.install b/debian/cups-driver-gutenprint.install.in
index f7b1ca0..f7b1ca0 100644
--- a/debian/cups-driver-gutenprint.install
+++ b/debian/cups-driver-gutenprint.install.in
diff --git a/debian/escputil.install b/debian/escputil.install.in
index 75d88a3..75d88a3 100644
--- a/debian/escputil.install
+++ b/debian/escputil.install.in
diff --git a/debian/foomatic-db-gutenprint.install b/debian/foomatic-db-gutenprint.install.in
index dc49f93..dc49f93 100644
--- a/debian/foomatic-db-gutenprint.install
+++ b/debian/foomatic-db-gutenprint.install.in
diff --git a/debian/gimp-gutenprint.install b/debian/gimp-gutenprint.install.in
index ba3ece0..ba3ece0 100644
--- a/debian/gimp-gutenprint.install
+++ b/debian/gimp-gutenprint.install.in
diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install.in
index e76155a..e76155a 100644
--- a/debian/gutenprint-doc.install
+++ b/debian/gutenprint-doc.install.in
diff --git a/debian/gutenprint-locales.install b/debian/gutenprint-locales.install.in
index 525d334..525d334 100644
--- a/debian/gutenprint-locales.install
+++ b/debian/gutenprint-locales.install.in
diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install.in
index 39e9d13..39e9d13 100644
--- a/debian/ijsgutenprint.install
+++ b/debian/ijsgutenprint.install.in
diff --git a/debian/libgutenprint-dev.install b/debian/libgutenprint-dev.install
deleted file mode 100644
index b680b22..0000000
--- a/debian/libgutenprint-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/install/usr/lib/libgutenprint.so         usr/lib
-debian/install/usr/lib/pkgconfig/gutenprint.pc  usr/lib/pkgconfig
-debian/install/usr/include/gutenprint           usr/include
diff --git a/debian/libgutenprint-dev.install.in b/debian/libgutenprint-dev.install.in
new file mode 100644
index 0000000..bcdf187
--- /dev/null
+++ b/debian/libgutenprint-dev.install.in
@@ -0,0 +1,3 @@
+debian/install/@LIBDIR@/libgutenprint.so         @LIBDIR@
+debian/install/@LIBDIR@/pkgconfig/gutenprint.pc  @LIBDIR@/pkgconfig
+debian/install/usr/include/gutenprint            usr/include
diff --git a/debian/libgutenprint-doc.install b/debian/libgutenprint-doc.install.in
index 2864212..2864212 100644
--- a/debian/libgutenprint-doc.install
+++ b/debian/libgutenprint-doc.install.in
diff --git a/debian/libgutenprint2.install b/debian/libgutenprint2.install
deleted file mode 100644
index a0e934c..0000000
--- a/debian/libgutenprint2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/install/usr/lib/libgutenprint.so.*  usr/lib
-debian/install/usr/lib/gutenprint          usr/lib
-debian/install/usr/share/gutenprint/5.2    usr/share/gutenprint
diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in
new file mode 100644
index 0000000..0a9f0c3
--- /dev/null
+++ b/debian/libgutenprint2.install.in
@@ -0,0 +1,3 @@
+debian/install/@LIBDIR@/libgutenprint.so.*  @LIBDIR@
+debian/install/@LIBDIR@/gutenprint          @LIBDIR@
+debian/install/usr/share/gutenprint/5.2     usr/share/gutenprint
diff --git a/debian/libgutenprintui2-1.install b/debian/libgutenprintui2-1.install
deleted file mode 100644
index 42c6a6f..0000000
--- a/debian/libgutenprintui2-1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/install/usr/lib/libgutenprintui2.so.*  usr/lib
diff --git a/debian/libgutenprintui2-1.install.in b/debian/libgutenprintui2-1.install.in
new file mode 100644
index 0000000..6aedeb5
--- /dev/null
+++ b/debian/libgutenprintui2-1.install.in
@@ -0,0 +1 @@
+debian/install/@LIBDIR@/libgutenprintui2.so.*  @LIBDIR@
diff --git a/debian/libgutenprintui2-dev.install b/debian/libgutenprintui2-dev.install
deleted file mode 100644
index 3ea421f..0000000
--- a/debian/libgutenprintui2-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/install/usr/lib/libgutenprintui2.so         usr/lib
-debian/install/usr/lib/pkgconfig/gutenprintui2.pc  usr/lib/pkgconfig
-debian/install/usr/include/gutenprintui2           usr/include
diff --git a/debian/libgutenprintui2-dev.install.in b/debian/libgutenprintui2-dev.install.in
new file mode 100644
index 0000000..3c986f6
--- /dev/null
+++ b/debian/libgutenprintui2-dev.install.in
@@ -0,0 +1,3 @@
+debian/install/@LIBDIR@/libgutenprintui2.so         @LIBDIR@
+debian/install/@LIBDIR@/pkgconfig/gutenprintui2.pc  @LIBDIR@/pkgconfig
+debian/install/usr/include/gutenprintui2            usr/include
diff --git a/debian/rules b/debian/rules
index 596964b..9faf22f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR = usr/lib/$(DEB_HOST_MULTIARCH)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -20,6 +18,17 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+DH_OPTIONS = --with autotools_dev --builddirectory=debian/build
+
+DH_INSTALL_FILES = $(basename $(wildcard debian/*.install.in))
+
+# Use debhelper's dh
+%:
+	dh $@ $(DH_OPTIONS)
+
+%.install: %.install.in
+	sed -e 's;@LIBDIR@;$(LIBDIR);g' <$< >$@
+
 update-patch-series:
 	mkdir -p $(CURDIR)/debian/patches
 	rm -f $(CURDIR)/debian/patches/*.patch
@@ -31,118 +40,58 @@ update-patch-series:
 	  mv $${patch}.chomped $$patch; \
 	done
 
-autoconfigure: debian/autoconfigure-stamp
-debian/autoconfigure-stamp: debian/control
-	[ -r scripts/config.sub.orig ] || \
-	  cp -f scripts/config.sub scripts/config.sub.orig
-	[ -r scripts/config.guess.orig ] || \
-	  cp -f scripts/config.guess scripts/config.guess.orig
-
-	[ ! -r /usr/share/misc/config.sub ] || \
-	  cp -f /usr/share/misc/config.sub scripts/config.sub
-	[ ! -r /usr/share/misc/config.guess ] || \
-	  cp -f /usr/share/misc/config.guess scripts/config.guess
-
-	dh_testdir
-	mkdir debian/build; \
-	cd debian/build; \
-	../../configure --host=$(DEB_HOST_GNU_TYPE) \
-	  --build=$(DEB_BUILD_GNU_TYPE) \
-	  --prefix=/usr --mandir=\$${prefix}/share/man \
-	  --disable-static --enable-shared --disable-rpath --disable-static-genppd \
+override_dh_auto_configure: debian/build/config.status
+debian/build/config.status: configure debian/control
+	dh_auto_configure -- \
+	  --disable-static --enable-shared --disable-rpath \
+	  --disable-static-genppd \
 	  --with-modules=dlopen \
 	  --enable-libgutenprintui2 --with-gimp2 \
 	  --with-cups --enable-cups-level3-ppds --enable-globalized-cups-ppds \
 	  --with-foomatic --with-foomatic3 \
 	  --disable-test
 
-	touch $@
-
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f $(DH_INSTALL_FILES)
+	rm -rf debian/install debian/install-stamp
 
-build: debian/build-stamp
-debian/build-stamp: debian/autoconfigure-stamp
-	dh_testdir
+override_dh_auto_build:
+	$(MAKE) -C debian/build
 
-	cd debian/build; \
-	$(MAKE)
+override_dh_auto_test:
+# Testsuite takes too long to run per-build, so skip.
 
+override_dh_auto_install: debian/install-stamp
+debian/install-stamp:
+	$(MAKE) -C debian/build DESTDIR=$(CURDIR)/debian/install install
 	touch $@
 
-clean: realclean
-realclean: debian/control
-	dh_testdir
-
-	rm -rf debian/install-stamp debian/install
-	rm -rf debian/build-stamp debian/build
-	rm -rf debian/autoconfigure-stamp
-
-	[ ! -r scripts/config.guess.orig ] || \
-	  mv -f scripts/config.guess.orig scripts/config.guess || :
-	[ ! -r scripts/config.sub.orig ] || \
-	  mv -f scripts/config.sub.orig scripts/config.sub || :
-
-	dh_clean
-
-install: install-indep install-arch
-
-install-indep:
-	$(MAKE) -f debian/rules DH_OPTIONS=-i install-common
-
-install-arch:
-	$(MAKE) -f debian/rules DH_OPTIONS=-s install-common
+install-arch: build-arch $(DH_INSTALL_FILES)
+	dh $@ $(DH_OPTIONS)
+	find debian/cups-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
 
-install-common: debian/install-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install
+install-indep: build-indep $(DH_INSTALL_FILES)
+	dh $@ $(DH_OPTIONS)
 
-debian/install-stamp: debian/build-stamp debian/control
-	cd debian/build; \
-	$(MAKE) DESTDIR=$(CURDIR)/debian/install install
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
 
-	touch $@
+override_dh_compress:
+	dh_compress -X.pdf -X.odt
 
-# Build architecture-independent files here.
-binary-indep: install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i NEWS
-	dh_link -i
-	dh_compress -i -X.pdf -X.odt
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir -s
-	dh_testroot -s
-	dh_installdocs -s
+override_dh_installdocs:
+ifneq (,$(shell dh_listpackages -a 2>/dev/null))
 	  cp src/cups/README debian/cups-driver-gutenprint/usr/share/doc/cups-driver-gutenprint/README.cups
 	  mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.2.1
 	  ln -s ijsgutenprint.5.2.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz
 	  ln -s ijsgutenprint.5.2 debian/ijsgutenprint/usr/bin/ijsgutenprint
-	dh_installexamples -s
-	dh_installchangelogs -s NEWS
-	dh_strip -s
-	dh_link -s
-	dh_compress -s -X.pdf -X.odt
-	dh_fixperms -s
-# Strip DT_RPATH from CUPS binaries.
-	find debian/cups-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
+endif
+
+override_dh_makeshlibs:
 	dh_makeshlibs -s -V -X usr/lib/gutenprint
-	dh_installdeb -s
-	dh_shlibdeps -s -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint2/usr/lib:$(CURDIR)/debian/libgutenprintui2-1/usr/lib
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
 
-binary: binary-indep binary-arch
+override_dh_shlibdeps:
+	dh_shlibdeps -s -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint2/usr/lib:$(CURDIR)/debian/libgutenprintui2-1/usr/lib
 
-.PHONY: build clean binary-indep binary-arch binary install install-arch install-indep install-common autoconfigure update-patch-series
+.PHONY: install-arch install-indep update-patch-series override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_compress override_dh_installdocs override_dh_makeshlibs override_dh_shlibdeps