[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f

[Peter Pentchev]

The following commit has been merged in the master branch:
commit b0d41a981894ab1f419f13285309c46c7ecc9c70
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Dec 5 23:50:26 2010 +0200

    Minimize the rules file using override targets.

diff --git a/debian/changelog b/debian/changelog
index 4c475c5..668f821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
   * Add the Vcs-Git and Vcs-Browser source control fields.
   * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS
     and LDFLAGS.
-  * Bump the debhelper compatibility version to 7:
-    - dh_clean removes build-stamp now
-    - shorten the rules file using the dh(1) helper
+  * Bump the debhelper compatibility version to 7 and minimize the rules
+    file using the dh(1) helper and debhelper override targets.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 24 Oct 2010 18:56:37 +0300
 
diff --git a/debian/control b/debian/control
index b13b61f..73fb620 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.15.7~),
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.15.7~),
 	autotools-dev, texlive-extra-utils, libpng12-dev
 Standards-Version: 3.9.1
 Homepage: http://bachue.com/matanza/
diff --git a/debian/rules b/debian/rules
index cb98c9f..8e48085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,35 +7,19 @@ CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
 CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 CFLAGS += -Wall
 export CFLAGS CPPFLAGS LDFLAGS
 
-build: build-stamp
-build-stamp:
-	dh build --before auto_configure
+# Note: this could be simplified even further using --with autotools_dev,
+# but it would require another repacking to bring back config.{guess,sub} :)
+#
+override_dh_auto_configure:
 	cp -f /usr/share/misc/config.sub .
 	cp -f /usr/share/misc/config.guess .
 	dh_auto_configure -- --bindir=/usr/games
-	dh build --before auto_build
-	dh_auto_build -- CFLAGS="$(CFLAGS)"
-	dh build --remaining
-	touch build-stamp
-
-clean:
-	dh $@
 
-install: build
-	dh $@
+override_dh_auto_build:
+	dh_auto_build -- CFLAGS="$(CFLAGS)"
 
-binary: binary-indep binary-arch
-binary-indep: install
-binary-arch: install
+%:
 	dh $@
-
-.PHONY: build clean install binary binary-arch binary-indep
-
-#Local variables:
-#mode: makefile
-#End:

-- 
matanza - a space ascii war game