[SCM] terminatorx/master: Switch to DH 7.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9de5e960d190027dd1798005829ac08f54e35d30
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 2 00:58:54 2012 +0200

    Switch to DH 7.

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 2385dad..8a36840 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Alessio Treglia <alessio at debian.org>
 Build-Depends:
  autotools-dev,
- debhelper (>= 4.1.16),
+ debhelper (>= 7.0.50~),
  ladspa-sdk,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libatk1.0-dev,
diff --git a/debian/rules b/debian/rules
index ab7f660..b49a0c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PACKAGE=terminatorx
-
-# 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_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -24,80 +15,26 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)))
 	EXTRA_CONFIGURE := --enable-capabilities
 endif
 
-config.status: configure
-	dh_testdir
-
-	cp /usr/share/misc/config.guess .
-	cp /usr/share/misc/config.sub   .
-
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-                    --prefix=/usr \
-                    --mandir=/usr/share/man \
-                    --enable-mpg123=/usr/bin/mpg321 \
-		    --enable-suidroot $(EXTRA_CONFIGURE) \
-                    gnomedatadir=/usr/share/ \
-                    gnomepresent=yes \
-	|| (cat config.log && false)
+%:
+	dh $@ --with autotools-dev
 
+override_dh_auto_configure:
+	dh_auto_configure -- \
+                      --enable-mpg123=/usr/bin/mpg321 \
+                      --enable-suidroot $(EXTRA_CONFIGURE) \
+                      gnomedatadir=/usr/share/ \
+                      gnomepresent=yes
 	find -name '*.xml' -exec perl -i -pe 's,http://www.oasis-open.org/docbook/xml/([^/]+)/docbookx.dtd,/usr/share/sgml/docbook/dtd/xml/\1/docbookx.dtd,' {} \;
 
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean: clean1
-
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f Makefile ] || -$(MAKE) distclean
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f src/license.c
-
-	rm -f config.guess config.sub
-
-	dh_clean
 	find -name '*.xml' -exec perl -i -pe 's,/usr/share/sgml/docbook/dtd/xml/([^/]+)/docbookx.dtd,http://www.oasis-open.org/docbook/xml/\1/docbookx.dtd,' {} \;
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/terminatorx/
+override_dh_auto_install:
+	dh_auto_install
 	(cd gnome-support && \
 	 cp terminatorX-app.xpm $(CURDIR)/debian/terminatorx/usr/share/pixmaps)
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installdocs
-	dh_installmenu
+override_dh_installman:
 	dh_installman terminatorX.1
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

-- 
terminatorx packaging