This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch openarena-oacmp1 in repository openarena-data.
commit 9d145ee6b30ecdfc8954c119038b43ac2f1cf886 Merge: 6c5f56f 8f4e485 Author: Simon McVittie <[email protected]> Date: Tue Jun 28 11:52:22 2016 +0100 Merge tag 'debian/openarena-data/0.8.5split-8' into openarena-oacmp1 openarena-data Debian release 0.8.5split-8 debian/changelog | 44 +++++++++++++++++++++++++++++--------------- debian/control | 4 ++-- debian/rules | 20 ++++++++++++++++---- 3 files changed, 47 insertions(+), 21 deletions(-) diff --cc debian/changelog index 76009ba,dd07ab9..f6c8058 --- a/debian/changelog +++ b/debian/changelog @@@ -1,25 -1,40 +1,39 @@@ - openarena-oacmp1 (3-2) UNRELEASED; urgency=medium -openarena-data (0.8.5split-8) unstable; urgency=medium ++openarena-oacmp1 (3-2) unstable; urgency=medium + - * Merge from openarena-data/0.8.5split-7: - - 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 <[email protected]> Sat, 09 May 2015 11:00:18 +0100 + [ Alexandre Detiste ] + * Normalize permissions of PK3 archive contents to 0644/0755 to + fix reproducibility under different umask (Closes: #819965) + + [ Simon McVittie ] ++ * 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 <[email protected]> Tue, 28 Jun 2016 10:38:50 +0100 ++ -- Simon McVittie <[email protected]> Tue, 28 Jun 2016 11:52:15 +0100 -openarena-data (0.8.5split-7) unstable; urgency=medium +openarena-oacmp1 (3-1) 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 + * New source package for the OpenArena Community Map Pack, volume 1 - -- Simon McVittie <[email protected]> Thu, 24 Mar 2016 10:23:22 +0000 + -- Simon McVittie <[email protected]> Sat, 09 May 2015 14:29:46 +0100 openarena-data (0.8.5split-6) unstable; urgency=medium diff --cc debian/control index e8ff2d2,15b89c2..9db573a --- a/debian/control +++ b/debian/control @@@ -11,23 -11,25 +11,23 @@@ 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-oacmp1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-oacmp1 -Package: openarena-data +Package: openarena-oacmp1 Architecture: all Depends: - openarena-081-maps, - openarena-081-misc, - openarena-081-players, - openarena-081-players-mature, - openarena-081-textures, - openarena-085-data, + openarena-088-data, ${misc:Depends}, +Enhances: + openarena, + openarena-server, Breaks: - openarena (<< 0.8.1-8~), - openarena-server (<< 0.8.1-8~), -Description: OpenArena game data + openarena (<< 0.8.8), + openarena-server (<< 0.8.8), +Description: OpenArena Community Map Pack 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 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
