[game-data-packager] 01/01: name heretic & hexen packages in a consistent way

[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 45670725c27b7e2829330cb49bc1b9c19cc0f613
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon May 4 19:20:49 2015 +0200

    name heretic & hexen packages in a consistent way
    
    no 'provides:', nothing expect these packages,
    
    no 'conflicts:' needed either as long as GDP does this:
    
        replace = package.debian.get('replaces')
        if replace:
            conflicts.add(replace)
---
 data/heretic.control.in |  1 -
 data/heretic.yaml       |  4 +++-
 data/hexen.yaml         | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/data/heretic.control.in b/data/heretic.control.in
index abfa30e..7c0ee6c 100644
--- a/data/heretic.control.in
+++ b/data/heretic.control.in
@@ -1,4 +1,3 @@
-Breaks: chocolate-doom (<< 2)
 Description: IWAD from Raven Software's heretic computer game
  Heretic requires both a heretic-engine and a heretic-wad to play. This package
  contains the IWAD from Raven Software's game "GAME"
diff --git a/data/heretic.yaml b/data/heretic.yaml
index 023d8eb..be5b592 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -30,10 +30,12 @@ packages:
     install:
     - heretic.wad
 
-  heretic-shareware-data:
+  heretic-shareware-wad:
     longname: "Heretic (shareware)"
     install_to: usr/share/games/doom
     demo_for: heretic-wad
+    debian:
+      replaces: heretic-shareware-data
     install:
     - heretic1.wad
 
diff --git a/data/hexen.yaml b/data/hexen.yaml
index 437e552..645bee9 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -11,10 +11,10 @@ help_text: |
   Patching older versions is not currently supported. If you have
   an older version, it might be possible to patch it manually using dosbox.
 
-  hexen-deathkings-data requires HEXDD.WAD from the Deathkings of the
+  hexen-deathkings-wad requires HEXDD.WAD from the Deathkings of the
   Dark Citadel expansion.
 
-  hexen-demo-data requires HEXEN.WAD from the Hexen demo v1.0, which
+  hexen-demo-wad requires HEXEN.WAD from the Hexen demo v1.0, which
   will be downloaded automatically if necessary. It will be renamed to
   hexendemo.wad to avoid colliding with the full version of Hexen.
 
@@ -32,10 +32,11 @@ packages:
     install:
     - hexen.wad
 
-  hexen-deathkings-data:
+  hexen-deathkings-wad:
     longname: "Hexen: Deathkings of the Dark Citadel"
     debian:
       breaks: chocolate-doom (<< 2)
+      replaces: hexen-deathkings-data
     steam:
       id: 2370
       path: "common/Hexen Deathkings of the Dark Citadel"
@@ -44,8 +45,10 @@ packages:
     install:
     - hexdd.wad
 
-  hexen-demo-data:
+  hexen-demo-wad:
     longname: "Hexen: Beyond Heretic (demo)"
+    debian:
+      replaces: hexen-demo-data
     install_to: usr/share/games/doom
     demo_for: hexen-wad
     install:

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