[openarena-data] 01/01: Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-088-data
Simon McVittie
smcv at debian.org
Tue Jun 28 11:51:11 UTC 2016
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 618c0c0e05e7da31c3f5449a1f5a045c9f54c9ac
Merge: 1dd6790 8f4e485
Author: Simon McVittie <smcv at debian.org>
Date: Tue Jun 28 10:50:29 2016 +0100
Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-088-data
openarena-data Debian release 0.8.5split-8
debian/changelog | 23 +++++++++++++++++++----
debian/control | 4 ++--
debian/rules | 20 ++++++++++++++++----
3 files changed, 37 insertions(+), 10 deletions(-)
diff --cc debian/changelog
index c88323d,dd07ab9..fb0d7f3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,31 +1,27 @@@
- openarena-088-data (0.8.8-6) UNRELEASED; urgency=medium
-openarena-data (0.8.5split-8) unstable; urgency=medium
++openarena-088-data (0.8.8-6) unstable; urgency=medium
+
- * Merge from openarena-data/0.8.5split-7:
- - 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:15:28 +0000
+ [ Alexandre Detiste ]
+ * Normalize permissions of PK3 archive contents to 0644/0755 to
+ fix reproducibility under different umask (Closes: #819965)
+
+ [ Simon McVittie ]
++ * 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> Tue, 28 Jun 2016 10:38:50 +0100
++ -- Simon McVittie <smcv at debian.org> Tue, 28 Jun 2016 10:50:19 +0100
-openarena-data (0.8.5split-7) unstable; urgency=medium
+openarena-088-data (0.8.8-5) 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
diff --cc debian/control
index 3480339,15b89c2..c768484
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -11,20 +11,14 @@@ 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-088-data
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-088-data
-Package: openarena-data
+Package: openarena-088-data
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~),
--
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