[game-data-packager] 01/10: make .control.in file completely optional

Simon McVittie smcv at debian.org
Sun Jan 18 09:25:14 UTC 2015


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 3e88eed62706e756f398354991a94b8518ffca88
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Jan 17 22:08:29 2015 +0100

    make .control.in file completely optional
---
 data/spear-of-destiny-data.control.in          |  6 ------
 data/spear-of-destiny-mission2-data.control.in |  5 -----
 lib/game_data_packager/__init__.py             | 18 ++++++++++++++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/data/spear-of-destiny-data.control.in b/data/spear-of-destiny-data.control.in
index 0d04206..e69de29 100644
--- a/data/spear-of-destiny-data.control.in
+++ b/data/spear-of-destiny-data.control.in
@@ -1,6 +0,0 @@
-Version: VERSION
-Description: Game data for Wolfenstein 3D sequel: Spear Of Destiny
- wolf4sdl requires game data to play. This package contains
- the commercial game data from Spear Of Destiny,
- the sequel of Wolfenstein 3D and was generated
- using the "game-data-packager" program.
diff --git a/data/spear-of-destiny-mission2-data.control.in b/data/spear-of-destiny-mission2-data.control.in
deleted file mode 100644
index 89feaa5..0000000
--- a/data/spear-of-destiny-mission2-data.control.in
+++ /dev/null
@@ -1,5 +0,0 @@
-Version: VERSION
-Description: Spear of Destiny - Mission 2: Return to Danger
- This package contains extra levels for Spear Of Destiny,
- the sequel of Wolfenstein 3D and was generated
- using the "game-data-packager" program.
diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index 061f50f..bb4dce8 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1449,8 +1449,11 @@ class GameData(object):
                 shell=True, cwd=destdir)
         os.chmod(os.path.join(destdir, 'DEBIAN/md5sums'), 0o644)
 
-        control_in = open(self.get_control_template(package))
-        control = Deb822(control_in)
+        try:
+            control_in = open(self.get_control_template(package))
+            control = Deb822(control_in)
+        except FileNotFoundError:
+            control = Deb822()
         self.modify_control_template(control, package, destdir)
         control.dump(fd=open(os.path.join(debdir, 'control'), 'wb'),
                 encoding='utf-8')
@@ -1533,6 +1536,17 @@ class GameData(object):
 
         control['Version'] = package.version
 
+        if 'Description' not in control:
+            long_desc =  ' This package was built using game-data-packager. It contains\n'
+            long_desc += ' proprietary game data and must not be redistributed.\n'
+            long_desc += ' .\n'
+            long_desc += ' Game: ' + package.longname
+            if engine:
+                long_desc += '\n .\n'
+                long_desc += ' Intended for use with: ' + engine
+
+            control['Description'] = 'data for ' + package.longname + '\n' + long_desc
+
     def get_control_template(self, package):
         return os.path.join(DATADIR, package.name + '.control.in')
 

-- 
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