[openarena-data] 02/04: Verify at dh_builddeb time that the PK3 is compatible with upstream
Simon McVittie
smcv at debian.org
Thu Mar 24 10:10:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch openarena-088-data
in repository openarena-data.
commit e6505d9b9af3c0fe817c4fc95742882f1e106eee
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 24 09:32:12 2016 +0000
Verify at dh_builddeb time that the PK3 is compatible with upstream
---
debian/changelog | 1 +
debian/clean | 7 +++++--
debian/rules | 31 ++++++++++++++++++++++++-------
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 94702d7..e32d24c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openarena-088-data (0.8.8-5) UNRELEASED; urgency=medium
* gbp.conf: do not set export-dir, tarball-dir: this is a local
preference for the developer doing the build, not something that
should be in the VCS
+ * Verify at dh_builddeb time that the PK3 is compatible with upstream
-- Simon McVittie <smcv at debian.org> Thu, 24 Mar 2016 09:01:26 +0000
diff --git a/debian/clean b/debian/clean
index e06f7d6..8a26b21 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,8 @@
-debian/qvmbrute
*.pk3
*/vm/*.qvm
-debian/openarena-data.README.Debian
+debian/*.pk3.contents.raw
+debian/*.pk3.filenames
+debian/*.pk3.qvms
debian/openarena-085-data.README.Debian
+debian/openarena-data.README.Debian
+debian/qvmbrute
diff --git a/debian/rules b/debian/rules
index ca559fe..151f432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,20 +16,27 @@ build_date := $(shell dpkg-parsechangelog --show-field=Date)
override_dh_auto_build: $(patsubst %,build/%,$(paks))
:
-build/%:
- set -e && sed -n -e 's/#.*//; s/\.qvm$$//p;' < debian/$*.pk3.contents | \
- while read crc filename; do \
+debian/%.pk3.contents.raw: debian/%.pk3.contents
+ sed -n -e 's/#.*//; /./p;' < $< > $@
+
+debian/%.pk3.filenames: debian/%.pk3.contents
+ sed -n -e 's/#.*//; s/.*\t//p;' < $< > $@
+
+debian/%.pk3.qvms: debian/%.pk3.contents
+ sed -n -e 's/#.*//; s/\.qvm$$//p;' < $< > $@
+
+build/%: debian/%.pk3.qvms debian/%.pk3.filenames
+ set -e; while read crc filename; do \
test -f $*-$$crc.qvm || \
$(MAKE) -f debian/rules QVMPREFIX=$(*F) QVMCRC=$$crc \
debian/$(*F)-$$crc.qvm; \
install -d $*/vm; \
install -v -m644 debian/$(*F)-$$crc.qvm $*/$$filename.qvm; \
touch --date='$(build_date)' $*/$$filename.qvm; \
- done
+ done < debian/$*.pk3.qvms
rm -f $*.pk3
- sed -n -e 's/#.*//; s/.*\t//p;' < debian/$*.pk3.contents | \
- ( cd $* && zip -X -o -q -9 $(CURDIR)/$*.pk3 -@ )
- perl debian/list-pk3.pl $*.pk3 | diff -u debian/$*.pk3.contents -
+ ( cd $* && zip -X -o -q -9 $(CURDIR)/$*.pk3 -@ ) < \
+ debian/$*.pk3.filenames
override_dh_auto_test: $(patsubst %,check/%,$(paks))
:
@@ -58,6 +65,16 @@ check/pak6-patch088: build/pak6-patch088
check/%: build/%
:
+# check that the PK3s are still compatible (do this as late as
+# possible so that they aren't going to be modified further)
+override_dh_builddeb: $(patsubst %,check-compat/%,$(paks))
+
+check-compat/%: debian/%.pk3.contents.raw
+ perl debian/list-pk3.pl \
+ debian/*/usr/share/games/openarena/*/$*.pk3 | \
+ sed -n -e 's/#.*//; /./p' | \
+ diff -u debian/$*.pk3.contents.raw -
+
build-indep: debian/openarena-088-data.README.Debian
debian/openarena-088-data.README.Debian: debian/qvms.README.Debian
install -m644 $< $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git
More information about the Pkg-games-commits
mailing list