[game-data-packager] 01/01: doom-common: move package_map to packaging/deb.py

Alexandre Detiste detiste-guest at moszumanska.debian.org
Fri Feb 5 09:20:05 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 8dcad27d7093fde3f86f3855e7d98e8a52d03594
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Feb 5 10:19:40 2016 +0100

    doom-common: move package_map to packaging/deb.py
---
 game_data_packager/games/doom_common.py | 10 +---------
 game_data_packager/packaging/deb.py     |  5 +++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 7b95c7a..14093f9 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -98,18 +98,10 @@ class DoomTask(PackagingTask):
         super(DoomTask, self).fill_extra_files(package, destdir)
 
         for main_wad, quirks in package.main_wads.items():
-            package_map = {
-                    'doom-engine': 'doom',
-                    'boom-engine': 'boom',
-                    'heretic-engine': 'heretic',
-                    'hexen-engine': 'hexen',
-                    'doomsday': 'doomsday-compat',
-            }
-
             engine = self.packaging.substitute(package.engine or self.game.engine,
                     package.name)
             engine = engine.split('|')[-1].strip()
-            program = package_map.get(engine, engine)
+            program = self.packaging.tool_for_package(engine)
 
             wad_base = os.path.splitext(main_wad)[0]
 
diff --git a/game_data_packager/packaging/deb.py b/game_data_packager/packaging/deb.py
index 4c3c661..1b32593 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -43,6 +43,11 @@ class DebPackaging(PackagingSystem):
                   '7z': 'p7zip-full',
                   'unrar-nonfree': 'unrar',
                   'zoom': 'zoom-player',
+                  'doom': 'doom-engine',
+                  'boom': 'boom-engine',
+                  'heretic': 'heretic-engine',
+                  'hexen': 'hexen-engine',
+                  'doomsday-compat': 'doomsday',
                   }
     RENAME_PACKAGES = {
             'libSDL-1.2.so.0': 'libsdl1.2debian',

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