[game-data-packager] 20/21: Rename Quake II mission packs to something closer to their marketing names

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit c4c4fbe3802a8eeaa3516cc1c907b9c37bc78f1d
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 22 00:56:57 2015 +0000

    Rename Quake II mission packs to something closer to their marketing names
---
 ...ontrol.in => quake2-groundzero-data.control.in} |  0
 ....copyright => quake2-groundzero-data.copyright} |  4 ++--
 ...control.in => quake2-reckoning-data.control.in} |  0
 ...x.copyright => quake2-reckoning-data.copyright} |  4 ++--
 data/quake2.yaml                                   | 23 ++++++++++++++--------
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/data/quake2-rogue.control.in b/data/quake2-groundzero-data.control.in
similarity index 100%
rename from data/quake2-rogue.control.in
rename to data/quake2-groundzero-data.control.in
diff --git a/data/quake2-rogue.copyright b/data/quake2-groundzero-data.copyright
similarity index 86%
rename from data/quake2-rogue.copyright
rename to data/quake2-groundzero-data.copyright
index b1c35ae..fdc5f20 100644
--- a/data/quake2-rogue.copyright
+++ b/data/quake2-groundzero-data.copyright
@@ -1,10 +1,10 @@
-The quake2-rogue package was generated using game-data-packager.
+The quake2-groundzero-data package was generated using game-data-packager.
 Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
 
 The files under "/usr/share/games/quake2/rogue" are
 user-supplied files that are not covered by the copyright or license of this
 package; they are copyright © 1998 Rogue Entertainment, all rights reserved.
-See /usr/share/doc/quake2-rogue/LICENSE for the full terms.
+See /usr/share/doc/quake2-groundzero-data/LICENSE for the full terms.
 
 The remainder of this package is covered by the following
 License:
diff --git a/data/quake2-xatrix.control.in b/data/quake2-reckoning-data.control.in
similarity index 100%
rename from data/quake2-xatrix.control.in
rename to data/quake2-reckoning-data.control.in
diff --git a/data/quake2-xatrix.copyright b/data/quake2-reckoning-data.copyright
similarity index 86%
rename from data/quake2-xatrix.copyright
rename to data/quake2-reckoning-data.copyright
index ce7f36d..a1c4265 100644
--- a/data/quake2-xatrix.copyright
+++ b/data/quake2-reckoning-data.copyright
@@ -1,10 +1,10 @@
-The quake2-xatrix package was generated using game-data-packager.
+The quake2-reckoning-data package was generated using game-data-packager.
 Copyright © 2008-2013 Jonathan Dowland <jmtd at debian.org>.
 
 The files under "/usr/share/games/quake2/xatrix" are
 user-supplied files that are not covered by the copyright or license of this
 package; they are copyright © 1998 Xatrix Entertainment, all rights reserved.
-See /usr/share/doc/quake2-xatrix/LICENSE for the full terms.
+See /usr/share/doc/quake2-reckoning-data/LICENSE for the full terms.
 
 The remainder of this package is covered by the following
 License:
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 3a75ea5..6b9e904 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -10,11 +10,10 @@ help_text: |
   providing q2-3.20-x86-full-ctf.exe or a fully patched installed copy
   (e.g. the version from Steam).
 
-  For quake2-demo-data, all necessary files can be downloaded automatically.
+  For the expansion packs quake2-reckoning (xatrix) and quake2-groundzero
+  (rogue), provide the appropriate pak0.pak and video directory.
 
-  The mission packs quake2-xatrix and quake2-rogue are currently treated
-  as separate games: use "game-data-packager q2xatrix" or
-  "game-data-packager q2rogue".
+  For quake2-demo-data, all necessary files can be downloaded automatically.
 
   For quake2-music, quake2-reckoning-music and quake2-groundzero-music, either
   provide a directory containing pre-ripped audio named like
@@ -331,7 +330,11 @@ packages:
       filename_format: "baseq2/music/%02d.ogg"
       first_track: 2
 
-  quake2-xatrix:
+  quake2-reckoning-data:
+    debian:
+      provides: quake2-xatrix
+      conflicts: quake2-xatrix
+      replaces: quake2-xatrix
     expansion_for: quake2-full-data
     # this is what Makefile says has been tested
     architecture: amd64 i386 ia64 sparc64
@@ -361,7 +364,7 @@ packages:
     - xatrix/docs/release.txt
 
   quake2-reckoning-music:
-    expansion_for: quake2-xatrix
+    expansion_for: quake2-reckoning-data
     # http://musicbrainz.org/release/a1eb0af4-6348-4aa6-a586-4f41a33c5dea
     install_to: usr/share/games/quake2
     rip_cd:
@@ -369,7 +372,11 @@ packages:
       filename_format: "xatrix/music/%02d.ogg"
       first_track: 2
 
-  quake2-rogue:
+  quake2-groundzero-data:
+    debian:
+      provides: quake2-rogue
+      conflicts: quake2-rogue
+      replaces: quake2-rogue
     expansion_for: quake2-full-data
     # this is what Makefile says has been tested
     architecture: amd64 i386 ia64 sparc64
@@ -396,7 +403,7 @@ packages:
     - rogue/docs/release.txt
 
   quake2-groundzero-music:
-    expansion_for: quake2-rogue
+    expansion_for: quake2-groundzero-data
     # http://musicbrainz.org/release/7590e38c-f203-425a-b726-37a55b6d2937
     install_to: usr/share/games/quake2
     rip_cd:

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