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 15b55e06fefc63877d18a2b0e85b3451a78b1e77
Merge: 733625c 77f1c48
Author: Simon McVittie <s...@debian.org>
Date: Tue Jan 16 08:48:08 2018 +0000
Merge branch 'openarena-data' into openarena-players-mature
debian/README.source | 30 +++++++++++++++++++++++++++---
debian/changelog | 9 +++++++++
debian/control | 6 +++---
3 files changed, 39 insertions(+), 6 deletions(-)
diff --cc debian/changelog
index a6df1b3,736c6c5..4c8061b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,14 +1,15 @@@
-openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
++openarena-players-mature (0.8.5split-11) UNRELEASED; urgency=medium
+
+ * Declare compliance with Debian Policy v4.1.3
+ * d/README.source: Document non-DEP-14 Debian packaging repository
+ layout
+ * Update Vcs-* for move to salsa.debian.org
+
+ -- Simon McVittie <s...@debian.org> Sun, 10 Dec 2017 18:58:10 +0000
+
-openarena-data (0.8.5split-10) unstable; urgency=medium
+openarena-players-mature (0.8.5split-10) unstable; urgency=medium
+ * Merge from openarena-data/0.8.5split-10:
* Use https URL for the Format of d/copyright
* Declare compliance with Debian Policy v4.1.1
* Move to debhelper compat level 10
diff --cc debian/control
index 8a9ac10,14f88cd..f3cb2fc
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
zip,
zlib1g-dev,
Rules-Requires-Root: no
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
Homepage: http://www.openarena.ws/
- 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
-Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b
openarena-data
-Vcs-Browser:
https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
++Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b
openarena-players-mature
++Vcs-Browser:
https://salsa.debian.org/games-team/openarena-data/tree/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
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
