[openarena-data] 01/01: Merge branch 'master' into openarena-088-data

[Simon McVittie]

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 9ebe765a80ad415176353cc2437112ef47079f64
Merge: 1cd87c6 3f24f65
Author: Simon McVittie <smcv at debian.org>
Date:   Fri May 8 08:20:13 2015 +0100

    Merge branch 'master' into openarena-088-data

 debian/changelog | 17 +++++++++++++++++
 debian/control   |  2 +-
 debian/copyright | 12 +++++++++++-
 debian/rules     | 39 ++++++++++++++++++++-------------------
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index 9f798b7,664aa7e..970fd88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,30 +1,27 @@@
 -openarena-data (0.8.5split-6) unstable; urgency=medium
++openarena-088-data (0.8.8-3) 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 packaging changes from openarena-data/0.8.5split-6,
++    including reproducible builds
+     - 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
++    - 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>  Mon, 04 May 2015 09:39:46 +0100
++ -- Simon McVittie <smcv at debian.org>  Fri, 08 May 2015 08:19:55 +0100
+ 
 -openarena-data (0.8.5split-4) unstable; urgency=medium
 +openarena-088-data (0.8.8-2) 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
 +    - Standards-Version: 3.9.5 (no changes)
 +    - Bump debhelper compat level to 9 to avoid deprecated dh_pysupport
  
 - -- Simon McVittie <smcv at debian.org>  Wed, 29 Apr 2015 11:10:34 +0100
 + -- Simon McVittie <smcv at debian.org>  Mon, 18 Aug 2014 12:22:31 +0100
  
  openarena-data (0.8.5split-3) unstable; urgency=low
  

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