This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch openarena-085-data
in repository openarena-data.
commit b3b418f3b333042162dc4d76f37860f63c91b4cb
Merge: a57e4ac aea947a
Author: Simon McVittie <s...@debian.org>
Date: Mon Oct 30 11:02:10 2017 +0000
Merge branch 'master' into openarena-085-data
CHANGES | 226 -------------------------
COPYING | 340 --------------------------------------
CREDITS | 76 ---------
CREDITS-0.8.5 | 78 ---------
CREDITS-0.8.8 | 90 ----------
LINUXNOTES | 5 -
README | 86 ----------
WENEED | 11 --
debian/README.source | 5 -
debian/changelog | 14 ++
debian/compat | 2 +-
debian/control | 5 +-
debian/copyright | 2 +-
debian/mp-pak0-449831c5.qvm | Bin 23 -> 0 bytes
debian/mp-pak0-73428e1b.qvm | Bin 23 -> 0 bytes
debian/mp-pak0-c8703d61.qvm | Bin 23 -> 0 bytes
debian/pak0-37554497.qvm | Bin 20 -> 0 bytes
debian/pak0-b2b99e5d.qvm | Bin 20 -> 0 bytes
debian/pak0-d2225dd5.qvm | Bin 20 -> 0 bytes
debian/pak6-patch085-087acd9c.qvm | Bin 29 -> 0 bytes
debian/pak6-patch085-438cf2c5.qvm | Bin 29 -> 0 bytes
debian/pak6-patch085-6602cd55.qvm | Bin 29 -> 0 bytes
debian/pak6-patch088-4c6fe463.qvm | Bin 29 -> 0 bytes
debian/pak6-patch088-bb90ea00.qvm | Bin 29 -> 0 bytes
debian/pak6-patch088-e27f432e.qvm | Bin 29 -> 0 bytes
debian/qvmbrute.c | 10 ++
debian/source/lintian-overrides | 2 -
debian/source/local-options | 1 -
debian/source/options | 2 +-
readme_085.txt | 70 --------
readme_088.txt | 133 ---------------
31 files changed, 30 insertions(+), 1128 deletions(-)
diff --cc debian/changelog
index c973fb7,ceca587..31a774b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,26 +1,29 @@@
+ openarena-data (0.8.5split-10) unstable; urgency=medium
+
+ * Use https URL for the Format of d/copyright
+ * Declare compliance with Debian Policy v4.1.1
+ * Move to debhelper compat level 10
+ * Remove pre-generated QVM files from source package, so that building
+ the package proves they can be regenerated
+ * d/qvmbrute.c: Include timing information
+ * Remove unused lintian overrides
+ * Set Rules-Requires-Root to no
+ * Remove all upstream files from packaging git repository
+
+ -- Simon McVittie <s...@debian.org> Mon, 30 Oct 2017 11:00:15 +0000
+
-openarena-data (0.8.5split-9) unstable; urgency=medium
+openarena-085-data (0.8.5split-9) unstable; urgency=medium
- * Normalize mtime of vm directory in PK3 archive to SOURCE_DATE_EPOCH
- for reproducible builds of openarena-data, openarena-085-data,
- openarena-088-data
+ * Merge from openarena-data/0.8.5split-9:
+ - Normalize mtime of vm directory in PK3 archive to SOURCE_DATE_EPOCH
+ for reproducible builds of openarena-data, openarena-085-data,
+ openarena-088-data
- -- Simon McVittie <s...@debian.org> Sun, 25 Sep 2016 17:38:41 +0100
+ -- Simon McVittie <s...@debian.org> Sun, 25 Sep 2016 17:39:35 +0100
-openarena-data (0.8.5split-8) unstable; urgency=medium
+openarena-085-data (0.8.5split-8) unstable; urgency=medium
+
+ * Merge from openarena-data/0.8.5split-8:
[ Alexandre Detiste ]
* Normalize permissions of PK3 archive contents to 0644/0755 to
diff --cc debian/control
index 7c755ca,9f4b105..d624479
--- a/debian/control
+++ b/debian/control
@@@ -11,18 -11,26 +11,19 @@@ Build-Depends-Indep
libarchive-zip-perl,
zip,
zlib1g-dev,
- Standards-Version: 3.9.8
+ Rules-Requires-Root: no
+ Standards-Version: 4.1.1
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-085-data
+Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-085-data
-Package: openarena-data
+Package: openarena-085-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~),
- openarena-server (<< 0.8.1-8~),
-Description: OpenArena game data
+Replaces:
+ openarena-data (<< 0.8.5split),
+Description: OpenArena game data - 0.8.5 update
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
