[openarena-data] 01/01: Merge branch 'master' into openarena-textures
Simon McVittie
smcv at debian.org
Wed Mar 2 10:14:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch openarena-textures
in repository openarena-data.
commit 00fc9f03112fa0b85d4e20c507308cab3fcad40e
Merge: a0ea090 5a355c2
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 2 10:13:42 2016 +0000
Merge branch 'master' into openarena-textures
debian/README.source | 4 +-
debian/changelog | 12 ++
debian/control | 17 +-
debian/copyright | 10 +-
debian/openarena-085-data.links | 2 +-
debian/openarena-088-data.links | 2 +-
debian/openarena-data.install | 2 +-
debian/openarena-oacmp1.docs | 3 +
debian/openarena-oacmp1.install | 3 +
debian/openarena-oacmp1.links | 4 +
debian/openarena-oacmp1.paks | 2 +
debian/rules | 58 +++--
debian/z_oacmp-volume1-v3.pk3.contents | 375 +++++++++++++++++++++++++++++++++
debian/z_oacmpcampaign.pk3.contents | 8 +
14 files changed, 475 insertions(+), 27 deletions(-)
diff --cc debian/changelog
index d595f66,45bbc08..9716500
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,25 +1,22 @@@
-openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
++openarena-textures (0.8.5split-7) UNRELEASED; 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)
+
+ -- Simon McVittie <smcv at debian.org> Sat, 09 May 2015 11:00:18 +0100
+
-openarena-data (0.8.5split-6) unstable; urgency=medium
+openarena-textures (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
-
-openarena-data (0.8.5split-5) unstable; urgency=medium
-
- * Another try at reproducibility:
+ * 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 6085352,9e2637f..b5eb3d1
--- a/debian/control
+++ b/debian/control
@@@ -2,20 -2,34 +2,25 @@@ Source: openarena-texture
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
- Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
- Simon McVittie <smcv at debian.org>
- Build-Depends: debhelper (>= 9)
- Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev
- Standards-Version: 3.9.6
+ Uploaders:
+ Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
+ Simon McVittie <smcv at debian.org>,
+ Build-Depends:
+ debhelper (>= 9),
+ Build-Depends-Indep:
+ libarchive-zip-perl,
+ zip,
+ zlib1g-dev,
+ Standards-Version: 3.9.7
Homepage: http://www.openarena.ws/
- Vcs-Git: git://anonscm.debian.org/pkg-games/openarena-data.git -b openarena-textures
-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-textures
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-textures
-Package: openarena-data
+Package: openarena-081-textures
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
+Depends: ${misc:Depends}
+Replaces: openarena-data (<< 0.8.5split)
+Description: OpenArena game data - textures 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