[game-data-packager] 01/01: quake.py: turn custom code in yaml tags

[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 7678b2d37d107959fe289afc2f172b4e4a6de0c5
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Mar 9 13:57:57 2015 +0100

    quake.py: turn custom code in yaml tags
---
 data/quake.yaml                   | 4 ++++
 game_data_packager/games/quake.py | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/data/quake.yaml b/data/quake.yaml
index 7da4e58..cc0646e 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -30,6 +30,7 @@ packages:
     longname: Quake (shareware)
     debian:
       provides: quake-data
+      conflicts: quake-registered
     install:
     - id1/pak0.pak_106
     - licinfo.txt_shareware
@@ -39,6 +40,9 @@ packages:
   quake-registered:
     debian:
       provides: quake-data
+      # when a replaces: is set,
+      # a conflicts: is implied too
+      replaces: quake-shareware
     steam:
       id: 2310
       path: common/Quake
diff --git a/game_data_packager/games/quake.py b/game_data_packager/games/quake.py
index 87a3165..9eb1998 100644
--- a/game_data_packager/games/quake.py
+++ b/game_data_packager/games/quake.py
@@ -47,14 +47,6 @@ class QuakeGameData(GameData):
         desc = desc.replace('LONG', (package.longname or self.longname))
         control['Description'] = desc
 
-        if package.name == 'quake-registered':
-            control['Conflicts'] = 'quake-shareware'
-            control['Replaces'] = 'quake-shareware'
-        elif package.name == 'quake-shareware':
-            control['Conflicts'] = 'quake-registered'
-        else:
-            control['Depends'] = 'quake-registered'
-
     def fill_extra_files(self, package, destdir):
         super(QuakeGameData, 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