[openarena-data] 01/01: Merge branch 'master' into openarena-oacmp1
Simon McVittie
smcv at debian.org
Wed Mar 2 10:14:19 UTC 2016
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 e35f066ee24a92eb254b36cb6f3d5dff78f8f75e
Merge: 7298176 5a355c2
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 2 10:05:06 2016 +0000
Merge branch 'master' into openarena-oacmp1
debian/changelog | 8 ++++++++
debian/control | 19 ++++++++++++-------
debian/openarena-085-data.links | 2 +-
debian/openarena-088-data.links | 2 +-
debian/openarena-data.install | 2 +-
debian/openarena-oacmp1.install | 2 +-
debian/openarena-oacmp1.links | 4 ++--
7 files changed, 26 insertions(+), 13 deletions(-)
diff --cc debian/changelog
index 978dd7d,45bbc08..348a89a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,18 @@@
-openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
++openarena-oacmp1 (3-2) 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-oacmp1 (3-1) unstable; urgency=medium
+
+ * Switch Vcs-Browser to cgit and https
+ * New source package for the OpenArena Community Map Pack, volume 1
+
+ -- Simon McVittie <smcv at debian.org> Sat, 09 May 2015 14:29:46 +0100
+
openarena-data (0.8.5split-6) unstable; urgency=medium
* Actually include the change to use zip -X -o, which somehow
diff --cc debian/control
index 059ea8d,9e2637f..e8ff2d2
--- a/debian/control
+++ b/debian/control
@@@ -2,27 -2,34 +2,32 @@@ Source: openarena-oacmp
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-oacmp1
-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:
- ${misc: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
More information about the Pkg-games-commits
mailing list