[openarena-data] 01/08: debian/rules: make more use of dh and /usr/share/dpkg/default.mk

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openarena-data.

commit c2348de31000c728e46c67f532582d2fb8bfd0e8
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 29 10:41:00 2015 +0100

    debian/rules: make more use of dh and /usr/share/dpkg/default.mk
---
 debian/changelog |  6 ++++++
 debian/rules     | 31 +++++++++++++------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cff955..1535a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openarena-data (0.8.5split-4) UNRELEASED; urgency=medium
+
+  * debian/rules: make more use of dh and /usr/share/dpkg/default.mk
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 29 Apr 2015 10:39:26 +0100
+
 openarena-data (0.8.5split-3) unstable; urgency=low
 
   * Update common files for 0.8.8
diff --git a/debian/rules b/debian/rules
index a90ba2b..d8a5018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,25 +3,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-clean install binary-arch binary-indep binary:
+include /usr/share/dpkg/default.mk
+
+%:
 	dh $@
 
-source := $(shell sed -ne 's/^Source: *//p' < debian/control)
-sourceversion := $(shell dpkg-parsechangelog | sed -ne 's/^Version: *//p')
-upstreamversion := $(firstword $(subst -, ,$(sourceversion)))
-tarball := $(source)_$(upstreamversion).orig.tar.bz2
-tardir := $(source)-$(upstreamversion).orig
-paks := $(shell cat debian/$(source).paks)
-
-build: build-arch build-indep
-build-arch:
-build-indep: \
-	$(patsubst %,build/%,$(paks)) \
-	$(patsubst %,check/%,$(paks)) \
-	debian/openarena-085-data.README.Debian \
-	debian/openarena-088-data.README.Debian \
-	debian/openarena-data.README.Debian
+tarball := $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.bz2
+tardir := $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).orig
+paks := $(shell cat debian/$(DEB_SOURCE).paks)
 
+build-indep: $(patsubst %,build/%,$(paks))
 build/%:
 	set -e && sed -n -e 's/#.*//; s/\.qvm$$//p;' < debian/$*.pk3.contents | \
 		while read crc filename; do \
@@ -36,6 +27,9 @@ build/%:
 		( cd $* && zip -q -9 $(CURDIR)/$*.pk3 -@ )
 	perl debian/list-pk3.pl $*.pk3 | diff -u debian/$*.pk3.contents -
 
+override_dh_auto_test: $(patsubst %,check/%,$(paks))
+	:
+
 check/pak0: build/pak0
 	grep "NTVEpak0" pak0/vm/cgame.qvm
 	grep "NTVEpak0" pak0/vm/qagame.qvm
@@ -60,17 +54,18 @@ check/pak6-patch088: build/pak6-patch088
 check/%: build/%
 	:
 
+build-indep: debian/openarena-088-data.README.Debian
 debian/openarena-088-data.README.Debian: debian/qvms.README.Debian
 	install -m644 $< $@
 
+build-indep: debian/openarena-085-data.README.Debian
 debian/openarena-085-data.README.Debian: debian/qvms.README.Debian
 	install -m644 $< $@
 
+build-indep: debian/openarena-data.README.Debian
 debian/openarena-data.README.Debian: debian/qvms.README.Debian
 	install -m644 $< $@
 
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 # order-only dependency: once we've generated it, no need to waste time
 # generating it again, it'll come out the same
 debian/$(QVMPREFIX)-$(QVMCRC).qvm: | debian/qvmbrute

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git