[game-data-packager] 01/09: Re-word some descriptions

[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 aafc1187dbb9b0d31e83e28b470d86d70862ea6a
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 4 07:18:34 2016 +0000

    Re-word some descriptions
---
 data/etqw.yaml                 | 6 +++---
 data/quake2.yaml               | 5 +++++
 data/quake4.yaml               | 5 ++---
 game_data_packager/__init__.py | 2 +-
 game_data_packager/build.py    | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/etqw.yaml b/data/etqw.yaml
index 22a5c65..56d1c7e 100644
--- a/data/etqw.yaml
+++ b/data/etqw.yaml
@@ -14,7 +14,7 @@ try_repack_from:
 
 packages:
   etqw-pb-bin:
-    longname: ETQW PunkBuster binaries
+    short_description: ETQW PunkBuster binaries
     install_to: usr/lib/etqw
     architecture: i386
     version: "1.5"
@@ -30,7 +30,7 @@ packages:
     - patch 1.5 Punkbuster licenses
 
   etqw-bin:
-    longname: "Enemy Territory Quake Wars binaries"
+    data_type: binaries
     install_to: usr/lib/etqw
     architecture: i386
     version: "1.5"
@@ -69,7 +69,7 @@ packages:
     - only on DVD - optional
 
   etqw-ko-data:
-    longname: "Enemy Territory Quake Wars - Korean language pack"
+    longname: "Enemy Territory: Quake Wars (Korean language pack)"
     version: "1.5"
     expansion_for: etqw-data
     lang: ko
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 64d82e2..9c24d4f 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -79,6 +79,7 @@ packages:
       - demo documentation
 
   quake2-music:
+    data_type: music
     aliases: [music]
     expansion_for: quake2-full-data
     # http://musicbrainz.org/release/06727a29-435d-423e-90a8-1a4fed5edb54
@@ -92,6 +93,7 @@ packages:
       first_track: 2
 
   quake2-reckoning-data:
+    data_type: data and binaries
     aliases: [xatrix, q2xatrix, reckoning, mp1, "1"]
     copyright: © 1998 Xatrix Entertainment
     description: |
@@ -128,6 +130,7 @@ packages:
       - xatrix docs
 
   quake2-reckoning-music:
+    data_type: music
     aliases: [mp1music]
     copyright: © 1998 Xatrix Entertainment
     expansion_for: quake2-reckoning-data
@@ -142,6 +145,7 @@ packages:
       first_track: 2
 
   quake2-groundzero-data:
+    data_type: data and binaries
     symlinks:
       usr/share/games/quake2/quake2-groundzero: usr/games/quake2
     aliases: [rogue, q2rogue, groundzero, mp2, "2"]
@@ -180,6 +184,7 @@ packages:
       - rogue docs
 
   quake2-groundzero-music:
+    data_type: music
     expansion_for: quake2-groundzero-data
     copyright: © 1998 Rogue Entertainment
     aliases: [mp2music]
diff --git a/data/quake4.yaml b/data/quake4.yaml
index 16fe494..48f3135 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -15,7 +15,7 @@ binary_executables: i386
 packages:
   quake4-pb-bin:
     DISABLED: mitigation for CVE-2007-5248 <http://aluigi.altervista.org/adv/d3engfspb-adv.txt>
-    longname: Quake 4 PunkBuster binaries
+    short_description: Quake 4 PunkBuster binaries
     install_to: usr/lib/quake4
     architecture: i386
     version: "1.4.2"
@@ -32,7 +32,7 @@ packages:
       - PBEULA.txt?steam
 
   quake4-bin:
-    longname: Quake 4 binaries
+    data_type: binaries
     install_to: usr/lib/quake4
     architecture: i386
     version: "1.4.2"
@@ -63,7 +63,6 @@ packages:
 
   quake4-data:
     version: "1.4.2"
-    longname: Quake 4
     debian:
       provides: quake4-any-data
       replaces: quake4-any-data
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 0630f04..661aea8 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -209,7 +209,7 @@ class GameDataPackage(object):
         self.longname = None
 
         # This word is used to build package description
-        # 'data' / 'PWAD' / 'IWAD'
+        # 'data' / 'PWAD' / 'IWAD' / 'binaries'
         self.data_type = 'data'
 
         # extra blurb of text added to .deb long description
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index f7e4313..3522961 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1740,7 +1740,7 @@ class PackagingTask(object):
         if package.short_description is not None:
             short_desc = package.short_description
         elif package.section == 'games':
-            short_desc = package.data_type + ' for "' + longname + '" game'
+            short_desc = 'game %s for %s' % (package.data_type, longname)
         else:
             short_desc = longname
 

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