[game-data-packager] 02/02: also move Quake 1 control files in yaml

Alexandre Detiste detiste-guest at moszumanska.debian.org
Wed May 11 08:28:31 UTC 2016


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

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

commit d5af19c772525a4f8b59c33a16d83b353b7b5c8d
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed May 11 10:23:45 2016 +0200

    also move Quake 1 control files in yaml
    
    not 100% the same as before,
    but it's easier to further tweak it in a single
    place in Python code.
    
    "Description: {+game music for+} Quake [-soundtrack-]"
---
 data/quake-armagon-music.control.in     | 14 -----------
 data/quake-common.control.in            |  8 ------
 data/quake-dissolution-music.control.in | 14 -----------
 data/quake-music.control.in             | 12 ---------
 data/quake.yaml                         | 44 +++++++++++++++++++++++++++++++++
 game_data_packager/games/quake.py       | 16 ------------
 6 files changed, 44 insertions(+), 64 deletions(-)

diff --git a/data/quake-armagon-music.control.in b/data/quake-armagon-music.control.in
deleted file mode 100644
index 07e5c09..0000000
--- a/data/quake-armagon-music.control.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Quake - Scourge of Armagon soundtrack
- This package contains the Quake - Scourge of Armagon (Mission Pack 1)
- soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
- encoded in Ogg Vorbis.
- .
- Many modified Quake engines can play this version of the soundtrack
- during gameplay without requiring the CD-ROM to be present.
- The original game would play these tracks from the CD, but many modern
- machines either do not have the necessary analogue pass-through cable
- from the CD drive to the sound card, or do not have an optical drive
- at all.
- .
- This package was generated using the "game-data-packager" program
- from the Debian package of the same name.
diff --git a/data/quake-common.control.in b/data/quake-common.control.in
deleted file mode 100644
index 6774e1f..0000000
--- a/data/quake-common.control.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Description: Quake commercial data files
- Quake requires an engine and game data to play. This package contains
- the commercial data from id Software's game "LONG",
- and was generated using the "game-data-packager" program from the Debian
- package of the same name.
- .
- To play Quake using this data, install a package providing the
- "quake-engine" virtual package.
diff --git a/data/quake-dissolution-music.control.in b/data/quake-dissolution-music.control.in
deleted file mode 100644
index 5222d0d..0000000
--- a/data/quake-dissolution-music.control.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Quake - Dissolution of Eternity soundtrack
- This package contains the Quake - Dissolution of Eternity (Mission Pack 2)
- soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
- encoded in Ogg Vorbis.
- .
- Many modified Quake engines can play this version of the soundtrack
- during gameplay without requiring the CD-ROM to be present.
- The original game would play these tracks from the CD, but many modern
- machines either do not have the necessary analogue pass-through cable
- from the CD drive to the sound card, or do not have an optical drive
- at all.
- .
- This package was generated using the "game-data-packager" program
- from the Debian package of the same name.
diff --git a/data/quake-music.control.in b/data/quake-music.control.in
deleted file mode 100644
index d0071ed..0000000
--- a/data/quake-music.control.in
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Quake soundtrack
- This package contains the Quake soundtrack by Trent Reznor,
- copied from the CD-ROM and encoded in Ogg Vorbis.
- Many modified Quake engines can play this version of the soundtrack
- during gameplay without requiring the CD-ROM to be present.
- The original game would play these tracks from the CD, but many modern
- machines either do not have the necessary analogue pass-through cable
- from the CD drive to the sound card, or do not have an optical drive
- at all.
- .
- This package was generated using the "game-data-packager" program
- from the Debian package of the same name.
diff --git a/data/quake.yaml b/data/quake.yaml
index da89c07..2e114fc 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -105,6 +105,18 @@ packages:
     aliases: [music]
     expansion_for: quake-registered
     install_to: usr/share/games/quake
+    copyright_notice: |
+      This package contains the Quake soundtrack by Trent Reznor,
+      copied from the CD-ROM and encoded in Ogg Vorbis.
+    description: |
+      This package contains the Quake soundtrack by Trent Reznor,
+      copied from the CD-ROM and encoded in Ogg Vorbis.
+      Many modified Quake engines can play this version of the soundtrack
+      during gameplay without requiring the CD-ROM to be present.
+      The original game would play these tracks from the CD, but many modern
+      machines either do not have the necessary analogue pass-through cable
+      from the CD drive to the sound card, or do not have an optical drive
+      at all.
     rip_cd:
       encoding: vorbis
       filename_format: "id1/music/track%02d.ogg"
@@ -115,6 +127,22 @@ packages:
     aliases: [mp1-music]
     expansion_for: quake-armagon
     install_to: usr/share/games/quake
+    copyright_notice: |
+      This package contains the Quake - Scourge of Armagon (Mission Pack 1)
+      soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
+      encoded in Ogg Vorbis.
+    short_description: Quake - Scourge of Armagon soundtrack
+    description: |
+      This package contains the Quake - Scourge of Armagon (Mission Pack 1)
+      soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
+      encoded in Ogg Vorbis.
+      .
+      Many modified Quake engines can play this version of the soundtrack
+      during gameplay without requiring the CD-ROM to be present.
+      The original game would play these tracks from the CD, but many modern
+      machines either do not have the necessary analogue pass-through cable
+      from the CD drive to the sound card, or do not have an optical drive
+      at all.
     rip_cd:
       encoding: vorbis
       filename_format: "hipnotic/music/track%02d.ogg"
@@ -125,6 +153,22 @@ packages:
     aliases: [mp2-music]
     expansion_for: quake-dissolution
     install_to: usr/share/games/quake
+    copyright_notice: |
+      This package contains the Quake - Dissolution of Eternity (Mission Pack 2)
+      soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
+      encoded in Ogg Vorbis.
+    short_description: Quake - Dissolution of Eternity soundtrack
+    description: |
+      This package contains the Quake - Dissolution of Eternity (Mission Pack 2)
+      soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
+      encoded in Ogg Vorbis.
+      .
+      Many modified Quake engines can play this version of the soundtrack
+      during gameplay without requiring the CD-ROM to be present.
+      The original game would play these tracks from the CD, but many modern
+      machines either do not have the necessary analogue pass-through cable
+      from the CD drive to the sound card, or do not have an optical drive
+      at all.
     rip_cd:
       encoding: vorbis
       filename_format: "rogue/music/track%02d.ogg"
diff --git a/game_data_packager/games/quake.py b/game_data_packager/games/quake.py
index f36f92f..7deb3f5 100644
--- a/game_data_packager/games/quake.py
+++ b/game_data_packager/games/quake.py
@@ -32,22 +32,6 @@ class QuakeTask(PackagingTask):
     not to be a shell script.
     """
 
-    def get_control_template(self, package):
-        for name in (package.name, 'quake-common'):
-            path = os.path.join(DATADIR, '%s.control.in' % name)
-            if os.path.exists(path):
-                return path
-        else:
-            raise AssertionError('quake-common.control.in should exist')
-
-    def modify_control_template(self, control, package, destdir):
-        super(QuakeTask, self).modify_control_template(control, package,
-                destdir)
-
-        desc = control['Description']
-        desc = desc.replace('LONG', (package.longname or self.game.longname))
-        control['Description'] = desc
-
     def fill_extra_files(self, package, destdir):
         super(QuakeTask, self).fill_extra_files(package, destdir)
 

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



More information about the Pkg-games-commits mailing list