Author: smcv Date: 2011-04-21 17:32:29 +0000 (Thu, 21 Apr 2011) New Revision: 12145
Modified: packages/trunk/openarena-data/debian/changelog packages/trunk/openarena-data/debian/control packages/trunk/openarena-data/debian/rules Log: revert unfinished changes accidentally committed here Modified: packages/trunk/openarena-data/debian/changelog =================================================================== --- packages/trunk/openarena-data/debian/changelog 2011-04-21 17:16:21 UTC (rev 12144) +++ packages/trunk/openarena-data/debian/changelog 2011-04-21 17:32:29 UTC (rev 12145) @@ -1,8 +1,6 @@ openarena-data (0.8.5-4) UNRELEASED; urgency=low * Fix misspelling in Description (Closes: #609493) - * Move to git - * Remove useless recommendation of client/server -- Simon McVittie <[email protected]> Sun, 09 Jan 2011 22:17:58 +0000 Modified: packages/trunk/openarena-data/debian/control =================================================================== --- packages/trunk/openarena-data/debian/control 2011-04-21 17:16:21 UTC (rev 12144) +++ packages/trunk/openarena-data/debian/control 2011-04-21 17:32:29 UTC (rev 12145) @@ -8,12 +8,13 @@ Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev Standards-Version: 3.9.1 Homepage: http://www.openarena.ws/ -Vcs-Git: git://git.debian.org/git/pkg-games/openarena-data.git -Vcs-Browser: http://git.debian.org/?p=pkg-games/openarena-data.git +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/openarena-data/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/openarena-data/?op=log Package: openarena-data Architecture: all Depends: ${misc:Depends} +Recommends: openarena (>= 0.8.1) | openarena-server (>= 0.8.1) Breaks: openarena-server (<< 0.8.1-8~), openarena (<< 0.8.1-8~) Description: OpenArena game data OpenArena is an open-source content package for Quake 3 Arena licensed Modified: packages/trunk/openarena-data/debian/rules =================================================================== --- packages/trunk/openarena-data/debian/rules 2011-04-21 17:16:21 UTC (rev 12144) +++ packages/trunk/openarena-data/debian/rules 2011-04-21 17:32:29 UTC (rev 12145) @@ -6,22 +6,28 @@ clean install binary-arch binary-indep binary: dh $@ -paks = pak0 mp-pak0 +build: + install -d baseoa/pak0/vm + install -d missionpack/mp-pak0/vm + set -e && \ + cd debian && for c in baseoa/*.contents missionpack/*.contents; do \ + pk3=$${c%.contents}; \ + prefix=$$(basename $${pk3%.pk3}); \ + dir=$${pk3%.pk3}; \ + echo "adding any missing fake QVM files for $$c"; \ + sed -n -e 's/#.*//; /\.qvm$$/p;' < $$c | \ + while read crc filename; do \ + test -f $$prefix-$$crc.qvm || $(MAKE) -C .. -f debian/rules QVMPREFIX=$$prefix QVMCRC=$$crc debian/$$prefix-$$crc.qvm; \ + cp $$prefix-$$crc.qvm ../$$dir/$$filename; \ + done; \ + echo "compressing $$dir to $$pk3"; \ + rm -f ../$$pk3; \ + sed -n -e 's/#.*//; s/.*\t//p;' < $$c | \ + ( cd ../$$dir && zip -q -9 ../`basename $$pk3` -@ ); \ + echo "checking contents of $$pk3 against $$c"; \ + ( cd .. && perl debian/list-pk3.pl $$pk3 ) | diff -u $$c -; \ + done -build: $(patsubst %,build/%,$(paks)) -build/%: - set -e && sed -n -e 's/#.*//; s/\.qvm$$//p;' < debian/$*.contents | \ - while read crc filename; do \ - test -f $*-$$crc.qvm || \ - $(MAKE) -C .. -f debian/rules QVMPREFIX=$* QVMCRC=$$crc \ - debian/$*-$$crc.qvm; \ - cp $*-$$crc.vm ../$*/$$filename; \ - done - rm -f $*.pk3 - sed -n -e 's/#.*//; s/.*\t//p;' < debian/$*.contents | \ - ( cd $* && zip -q -9 $(CURDIR)/$*.pk3 -@ ) - debian/list-pk3.pl $*.pk3 | diff -u debian/$*.contents - - DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) debian/$(QVMPREFIX)-$(QVMCRC).qvm: debian/qvmbrute @@ -30,25 +36,22 @@ debian/qvmbrute: debian/qvmbrute.c $(DEB_BUILD_GNU_TYPE)-gcc -Wall -lz -o debian/qvmbrute debian/qvmbrute.c -import-orig: $(patsubst %,import-orig/%,$(paks)) -import-orig/%: - @if ! test -f $*.pk3; then \ - echo "Copy upstream pk3 file to $*.pk3";\ +import-orig-pk3s: + @if ! test -f ../baseoa/pak0.pk3; then \ + echo "Put upstream pk3 files in ../baseoa, ../missionpack";\ exit 1;\ fi - rm -f debian/$*.contents - rm -rf ./$* - install -d $* - debian/list-pk3.pl $*.pk3 > debian/$*.contents - unzip -q $*.pk3 -x '*.qvm' '../*' -d $* - -tarball = openarena-data_0.8.5split.orig.tar.bz2 -tardir = openarena-data-0.8.5split.orig - -export-orig: - rm -rf $(tardir) - install -d $(tardir) - cp -al $(paks) $(tardir)/ - install -m644 CHANGES COPYING CREDITS $(tardir) - tar -jvcf ../$(tarball) $(tardir) - rm -rf $(tardir) + install -d debian/baseoa debian/missionpack + rm -f debian/baseoa/*.contents + rm -f debian/missionpack/*.contents + rm -fr baseoa missionpack + mkdir baseoa missionpack + # contains paths starting with "../", sigh + unzip -: ../missionpack/mp-pak0.pk3 ../CREDITS ../COPYING -d missionpack/mp-pak0 + set -e && ( cd .. && ls baseoa/*.pk3 missionpack/*.pk3 ) | \ + while read x; do \ + echo "unpacking $$x"; \ + install -d $${x%.pk3}; \ + perl debian/list-pk3.pl ../$$x > debian/$$x.contents; \ + unzip -q ../$$x -x '*.qvm' '../*' -d $${x%.pk3}; \ + done _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
