[openarena-data] 02/04: Merge branch 'master' into openarena-085-data

[Simon McVittie]

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

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

commit dd4021068c466e58a224bb7500aab40b4493e7b9
Merge: ba06e55 3f24f65
Author: Simon McVittie <smcv at debian.org>
Date:   Sat May 9 09:34:00 2015 +0100

    Merge branch 'master' into openarena-085-data

 debian/changelog | 12 ++++++++++++
 debian/rules     |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c54851e,664aa7e..2092fe2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,28 +1,23 @@@
 -openarena-data (0.8.5split-6) unstable; urgency=medium
++openarena-085-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 <smcv at debian.org>  Wed, 06 May 2015 20:37:47 +0100
 -
 -openarena-data (0.8.5split-5) unstable; urgency=medium
 -
 -  * Another try at reproducibility:
++  * Merge from openarena-data 0.8.5split-6:
+     - 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 5 to keep the version numbers in sync
+ 
 - -- Simon McVittie <smcv at debian.org>  Mon, 04 May 2015 09:39:46 +0100
++ -- Simon McVittie <smcv at debian.org>  Sat, 09 May 2015 09:33:54 +0100
+ 
 -openarena-data (0.8.5split-4) unstable; urgency=medium
 +openarena-085-data (0.8.5split-4) unstable; urgency=medium
  
 -  * 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-4:
 +    - 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)
  
   -- Simon McVittie <smcv at debian.org>  Wed, 29 Apr 2015 11:10:34 +0100
  

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