[game-data-packager] 01/01: scummvm & residualvm: fill engine automaticaly

[Alexandre Detiste]

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 d3de1079ff1c806c479e3174a61bac63dab5b7d0
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Mar 2 11:05:19 2015 +0100

    scummvm & residualvm: fill engine automaticaly
---
 data/fullthrottle.yaml                        | 2 --
 data/grimfandango.yaml                        | 4 ----
 data/maniacmansion.yaml                       | 4 ----
 data/tentacle.yaml                            | 2 --
 game_data_packager/games/residualvm_common.py | 5 +++++
 game_data_packager/games/scummvm_common.py    | 5 +++++
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/data/fullthrottle.yaml b/data/fullthrottle.yaml
index 637a130..8d341eb 100644
--- a/data/fullthrottle.yaml
+++ b/data/fullthrottle.yaml
@@ -9,8 +9,6 @@ plugin: scummvm_common
 gameid: ft
 packages:
   full-throttle-data:
-    debian:
-      engine: scummvm
     install:
     - DATA/BENCUT.NUT
     - DATA/BENFLIP.SAN
diff --git a/data/grimfandango.yaml b/data/grimfandango.yaml
index b4e780f..8ac3600 100644
--- a/data/grimfandango.yaml
+++ b/data/grimfandango.yaml
@@ -13,8 +13,6 @@ compress_deb: false
 
 packages:
   grimfandango-data:
-    debian:
-      engine: residualvm
     # Yes, the right way to use gfupd101.exe is really to just put it in
     # the data directory: residualvm can load files from there without a
     # separate unpacking step.
@@ -51,8 +49,6 @@ packages:
 
   grimfandango-demo-data:
     longname: "Grim Fandango (demo)"
-    debian:
-      engine: residualvm
     demo_for: grimfandango-data
     install:
     - gfdemo01.lab
diff --git a/data/maniacmansion.yaml b/data/maniacmansion.yaml
index 0464bb0..4b3dd42 100644
--- a/data/maniacmansion.yaml
+++ b/data/maniacmansion.yaml
@@ -7,8 +7,6 @@ plugin: scummvm_common
 gameid: maniac
 packages:
   maniacmansion-en-data:
-    debian:
-      engine: scummvm
     install:
     - 00.lfl
     - 01.lfl
@@ -67,8 +65,6 @@ packages:
 
   maniacmansion-fr-data:
     longname: Maniac Mansion (Fr)
-    debian:
-      engine: scummvm
     install:
     - 00.lfl_fr
     - 01.lfl_fr
diff --git a/data/tentacle.yaml b/data/tentacle.yaml
index 346563f..728be6d 100644
--- a/data/tentacle.yaml
+++ b/data/tentacle.yaml
@@ -9,8 +9,6 @@ gameid: tentacle
 packages:
   dayofthetentacle-data:
     install_to: usr/share/games/day-of-the-tentacle
-    debian:
-      engine: scummvm
     install:
     - monster.sof
     - tentacle.000
diff --git a/game_data_packager/games/residualvm_common.py b/game_data_packager/games/residualvm_common.py
index dfab42e..dd91991 100644
--- a/game_data_packager/games/residualvm_common.py
+++ b/game_data_packager/games/residualvm_common.py
@@ -32,6 +32,11 @@ class ResidualvmGameData(GameData):
 
         self.gameid = self.yaml['gameid']
 
+    def modify_control_template(self, control, package, destdir):
+        if 'engine' not in package.debian:
+            package.debian['engine'] = 'residualvm'
+        super(ResidualvmGameData, self).modify_control_template(control, package, destdir)
+
     def fill_extra_files(self, package, destdir):
         super(ResidualvmGameData, self).fill_extra_files(package, destdir)
 
diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index 63e848c..7746607 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -32,6 +32,11 @@ class ScummvmGameData(GameData):
 
         self.gameid = self.yaml['gameid']
 
+    def modify_control_template(self, control, package, destdir):
+        if 'engine' not in package.debian:
+            package.debian['engine'] = 'scummvm'
+        super(ScummvmGameData, self).modify_control_template(control, package, destdir)
+
     def fill_extra_files(self, package, destdir):
         super(ScummvmGameData, 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