[yquake2] 03/11: Add game code for CTF v1.05, which is also GPL

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository yquake2.

commit a11783a93a33854864bf37abbe2a8c278917eb9c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 14 11:05:50 2017 +0100

    Add game code for CTF v1.05, which is also GPL
---
 debian/changelog | 3 ++-
 debian/gbp.conf  | 2 ++
 debian/watch     | 9 ++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 290292e..055d46a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-yquake2 (7.01~dfsg1-2) UNRELEASED; urgency=medium
+yquake2 (7.01+ctf1.05~dfsg-1) UNRELEASED; urgency=medium
 
   * Change Architecture to linux-any. If someone wants to run this
     game on kFreeBSD or Hurd, please see the output of
@@ -8,6 +8,7 @@ yquake2 (7.01~dfsg1-2) UNRELEASED; urgency=medium
     no longer exists in 7.01, and stuff/misc no longer includes a
     precompiled mkdir.exe.
   * Rely on Files-Excluded in debian/copyright to repack tarball
+  * Add game code for CTF v1.05, which is also GPL
 
  -- Simon McVittie <smcv at debian.org>  Mon, 26 Jun 2017 11:05:54 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b3080b7..15b7551 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,3 +3,5 @@ debian-branch = debian/master
 upstream-branch = upstream/latest
 pristine-tar = True
 patch-numbers = False
+[import-orig]
+component = ctf
diff --git a/debian/watch b/debian/watch
index 735fe25..54b0b35 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,6 @@
-version=3
-opts="uversionmangle=s/.*QUAKE2_//g;s/WIN32_TEST//g;s/_/./g,dversionmangle=s/.dfsg.//g" \
- https://github.com/yquake2/yquake2/releases .*/(.*)\.tar\.gz
+version=4
+# TODO: CTF v1.05 is hard-coded here, but I don't see a way around that
+opts="repack,compression=gz,uversionmangle=s/_/./g,dversionmangle=s/.dfsg.//g;s/\+ctf.*//,oversionmangle=s/$/+ctf1.05~dfsg/" \
+ https://github.com/yquake2/yquake2/releases .*/QUAKE2_(.*)\.tar\.gz
+opts="uversionmangle=s/_/./g,dversionmangle=s/.dfsg.//g;s/.*\+ctf//,component=ctf,oversionmangle=s/$/+ctf1.05~dfsg/" \
+ https://github.com/yquake2/ctf/releases .*/CTF_(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git