This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch openarena-misc in repository openarena-data.
commit 0bf41f41b4d7d848e3e99c9b7fdbcd819fbf98af Merge: 3860353 3f24f65 Author: Simon McVittie <[email protected]> Date: Sat May 9 10:15:55 2015 +0100 Merge branch 'master' into openarena-misc debian/changelog | 17 +++++++++++++++++ debian/control | 2 +- debian/copyright | 12 +++++++++++- debian/rules | 39 ++++++++++++++++++++------------------- 4 files changed, 49 insertions(+), 21 deletions(-) diff --cc debian/changelog index d3ac77b,664aa7e..b625de2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,29 -1,49 +1,46 @@@ -openarena-data (0.8.5split-6) unstable; urgency=medium - - * Actually include the change to use zip -X -o, which somehow - didn't make it into the previous upload. - - -- Simon McVittie <[email protected]> Wed, 06 May 2015 20:37:47 +0100 - -openarena-data (0.8.5split-5) unstable; urgency=medium - - * Another try at reproducibility: ++openarena-misc (0.8.5split-6) UNRELEASED; urgency=medium ++ ++ * Merge packaging changes from openarena-data/0.8.5split-6: ++ - debian/rules: make more use of dh and /usr/share/dpkg/default.mk ++ - Apply changelog date to the fake QVM files, for reproducible builds ++ - debian/copyright: update date ++ - debian/copyright: list permissive license of list-pk3.pl and qvmbrute.c ++ - Standards-Version: 3.9.6 (no changes) + - do the build with TZ=UTC to make sure the (local) timestamps + in the zip file are the same in any build + - use zip -X to omit all optional fields (uid, gid, UTC timestamp) + - use zip -o to set the zip file's embedded timestamp equal to the + newest file in it ++ * Skip revision numbers -4, -5 to stay in sync with openarena-data + - -- Simon McVittie <[email protected]> Mon, 04 May 2015 09:39:46 +0100 ++ -- Simon McVittie <[email protected]> Wed, 29 Apr 2015 11:10:34 +0100 + -openarena-data (0.8.5split-4) unstable; urgency=medium +openarena-misc (0.8.5split-3) unstable; urgency=low - * debian/rules: make more use of dh and /usr/share/dpkg/default.mk - * Apply changelog date to the fake QVM files, for reproducible builds - * debian/copyright: update date - * debian/copyright: list permissive license of list-pk3.pl and qvmbrute.c - * Standards-Version: 3.9.6 (no changes) + * Merge from openarena-data 0.8.5split-3: + - Update common files for 0.8.8 + - Support build-arch, build-indep + - Standards-Version: 3.9.5 (no changes) + - Bump debhelper compat level to 9 to avoid deprecated dh_pysupport - -- Simon McVittie <[email protected]> Wed, 29 Apr 2015 11:10:34 +0100 + -- Simon McVittie <[email protected]> Mon, 18 Aug 2014 12:45:49 +0100 -openarena-data (0.8.5split-3) unstable; urgency=low +openarena-misc (0.8.5split-2) unstable; urgency=low - * Update common files for 0.8.8 - * Support build-arch, build-indep - * Standards-Version: 3.9.5 (no changes) - * Bump debhelper compat level to 9 to avoid deprecated dh_pysupport + * Merge from openarena-data 0.8.5split-2: + * Apply patch from Ubuntu to fix linking with more recent ld + (Closes: #629893, LP: #794941) + * Don't build qvmbrute unless we actually need to replace QVM files in + this particular package (only -data, -misc and -085-data actually need it) - -- Simon McVittie <[email protected]> Mon, 18 Aug 2014 10:42:55 +0100 + -- Simon McVittie <[email protected]> Sat, 16 Jul 2011 14:30:11 +0100 -openarena-data (0.8.5split-2) unstable; urgency=low +openarena-misc (0.8.5split-1) unstable; urgency=low - * Apply patch from Ubuntu to fix linking with more recent ld - (Closes: #629893, LP: #794941) - * Don't build qvmbrute unless we actually need to replace QVM files in - this particular package (only -data, -misc and -085-data actually need it) - * Move the split version of openarena-data to unstable + * New source package partially replacing openarena-data, to split up the + game content into more manageable pieces which fit on CDs better - -- Simon McVittie <[email protected]> Tue, 12 Jul 2011 08:42:08 +0100 + -- Simon McVittie <[email protected]> Sat, 28 May 2011 23:21:42 +0100 openarena-data (0.8.5split-1) experimental; urgency=low diff --cc debian/control index 30f52b6,2cad800..72eb171 --- a/debian/control +++ b/debian/control @@@ -6,16 -6,22 +6,16 @@@ Uploaders: Bruno "Fuddl" Kleinert <fudd Simon McVittie <[email protected]> Build-Depends: debhelper (>= 9) Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev - Standards-Version: 3.9.5 + Standards-Version: 3.9.6 Homepage: http://www.openarena.ws/ Vcs-Git: git://anonscm.debian.org/pkg-games/openarena-data.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/openarena-data.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/openarena-data.git;h=openarena-misc -Package: openarena-data +Package: openarena-081-misc Architecture: all -Depends: ${misc:Depends}, - openarena-081-maps, - openarena-081-players, - openarena-081-players-mature, - openarena-081-textures, - openarena-081-misc, - openarena-085-data -Breaks: openarena-server (<< 0.8.1-8~), openarena (<< 0.8.1-8~) -Description: OpenArena game data +Depends: ${misc:Depends} +Replaces: openarena-data (<< 0.8.5split) +Description: OpenArena game data - miscellaneous files from 0.8.1 OpenArena is an open-source content package for the Quake III engine, effectively creating a free stand-alone game similar to Quake III Arena. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
