[openarena-data] 01/01: Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-players-mature
Simon McVittie
smcv at debian.org
Tue Jun 28 11:51:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch openarena-players-mature
in repository openarena-data.
commit 48b8da9af000b7ea2d3c4f5778553bfefe6db501
Merge: 738d6d8 8f4e485
Author: Simon McVittie <smcv at debian.org>
Date: Tue Jun 28 11:56:57 2016 +0100
Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-players-mature
openarena-data Debian release 0.8.5split-8
debian/changelog | 50 ++++++++++++++++++++++++++++++++------------------
debian/control | 4 ++--
debian/rules | 20 ++++++++++++++++----
3 files changed, 50 insertions(+), 24 deletions(-)
diff --cc debian/changelog
index 912aff4,dd07ab9..42d0f9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,51 +1,44 @@@
- openarena-players-mature (0.8.5split-7) UNRELEASED; urgency=medium
-openarena-data (0.8.5split-8) unstable; urgency=medium
++openarena-players-mature (0.8.5split-8) unstable; 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
++ * Merge from openarena-data/0.8.5split-8:
- -- Simon McVittie <smcv at debian.org> Thu, 24 Mar 2016 10:23:22 +0000
+ [ 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
++ * 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> Thu, 24 Mar 2016 10:23:22 +0000
-
-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 <smcv at debian.org> Wed, 06 May 2015 20:37:47 +0100
++ -- Simon McVittie <smcv at debian.org> Tue, 28 Jun 2016 11:56:11 +0100
-openarena-data (0.8.5split-5) unstable; urgency=medium
+openarena-players-mature (0.8.5split-6) unstable; urgency=medium
- * Another try at reproducibility:
+ * Merge packaging 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)
diff --cc debian/control
index 926b0fb,15b89c2..26c5aa0
--- 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-players-mature
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-players-mature
-Package: openarena-data
+Package: openarena-081-players-mature
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 - "mature" player graphics 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
More information about the Pkg-games-commits
mailing list