[openarena-data] 01/01: Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-maps

[Simon McVittie]

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

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

commit d11433570446f69a15de9622d30125ff5a33dbc8
Merge: 51f7c6c 8f4e485
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jun 28 10:58:03 2016 +0100

    Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-maps
    
    openarena-data Debian release 0.8.5split-8

 debian/changelog | 21 +++++++++++++++++++++
 debian/control   |  4 ++--
 debian/rules     | 20 ++++++++++++++++----
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 315acee,dd07ab9..403fba1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,38 +1,40 @@@
 -openarena-data (0.8.5split-8) unstable; urgency=medium
++openarena-maps (0.8.5split-8) unstable; urgency=medium
++
++  * Merge from openarena-data/0.8.5split-8:
+ 
+   [ Alexandre Detiste ]
+   * Normalize permissions of PK3 archive contents to 0644/0755 to
+     fix reproducibility under different umask (Closes: #819965)
+ 
+   [ Simon McVittie ]
+   * d/rules: add a comment indicating why we cannot run
+     dh_strip_nondeterminism
+   * d/rules: chmod all files, even those not in the obvious directory
+     (mp-pak0.pk3 contains ../CREDITS and ../COPYING)
+   * Standards-Version: 3.9.8 (no changes needed)
+   * Pass CPPFLAGS to C compiler for QVM-synthesizing program, avoiding
+     warnings from build-log checks
+   * Use SOURCE_DATE_EPOCH for timestamps, and build-depend on the
+     debhelper version that defines it
+ 
+  -- Simon McVittie <smcv at debian.org>  Tue, 28 Jun 2016 10:38:50 +0100
+ 
 -openarena-data (0.8.5split-7) unstable; urgency=medium
 -
 -  * Switch Vcs-Browser to cgit and https
 -  * Add shared files for the OpenArena Community Map Pack, volume 1
 -    (available as the openarena-oacmp1 source package, but the majority
 -    of the debian/ directory is duplicated to simplify merging)
 -  * Standards-Version: 3.9.7 (no changes needed)
 -  * Normalize packaging via wrap-and-sort -abst
 -  * Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
 -  * 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
 -  * Do not put the PK3 files through dh_strip_nondeterminism: order
 -    is important for these files (see #819113)
 -  * Clean up generated openarena-088-data.README.Debian
 +openarena-maps (0.8.5split-7) UNRELEASED; urgency=medium
 +
 +  * Merge from openarena-data/0.8.5split-7:
 +    - Add shared files for the OpenArena Community Map Pack, volume 1
 +      (available as the openarena-oacmp1 source package, but the majority
 +      of the debian/ directory is duplicated to simplify merging)
 +    - Standards-Version: 3.9.7 (no changes needed)
 +    - Normalize packaging via wrap-and-sort -abst
 +    - Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
 +    - 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
 +    - Do not put the PK3 files through dh_strip_nondeterminism: order
 +      is important for these files (see #819113)
 +    - Clean up generated openarena-088-data.README.Debian
  
   -- Simon McVittie <smcv at debian.org>  Thu, 24 Mar 2016 10:23:22 +0000
  
diff --cc debian/control
index 51fb284,15b89c2..a448fac
--- a/debian/control
+++ b/debian/control
@@@ -11,18 -11,25 +11,18 @@@ Build-Depends-Indep
   libarchive-zip-perl,
   zip,
   zlib1g-dev,
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Homepage: http://www.openarena.ws/
 -Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git
 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/
 +Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b openarena-maps
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-maps
  
 -Package: openarena-data
 +Package: openarena-081-maps
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
 -Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - maps 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