[game-data-packager] 01/02: wolf3d-v*-data Conflicts and Replaces wolf3d-full-data

[Simon McVittie]

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 5935ab58e6389676ea2c0b2062c765d911950808
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 15 10:36:20 2015 +0100

    wolf3d-v*-data Conflicts and Replaces wolf3d-full-data
---
 data/wolf3d.yaml | 6 +++---
 debian/changelog | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index b616264..7e375f4 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -32,7 +32,7 @@ packages:
     debian:
       provides: wolf3d-data
       #conflicts: wolf3d-data
-      conflicts: [wolf3d-v14-data, wolf3d-full-v14-data, wolf3d-full-v12-data]
+      conflicts: [wolf3d-v14-data, wolf3d-full-v14-data, wolf3d-full-v12-data, wolf3d-full-data]
     install_to: usr/share/games/wolf3d
     install:
     - audiohed.wl6_1.0
@@ -49,8 +49,8 @@ packages:
     debian:
       provides: wolf3d-data
       #conflicts: wolf3d-data
-      conflicts: [wolf3d-v12-data, wolf3d-full-v12-data]
-      replaces: wolf3d-full-v14-data
+      conflicts: [wolf3d-v12-data, wolf3d-full-v12-data, wolf3d-full-data]
+      replaces: [wolf3d-full-v14-data, wolf3d-full-data]
     steam:
       id: 2270
       path: common/Wolfenstein 3D
diff --git a/debian/changelog b/debian/changelog
index a0e756e..4a1fc60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,7 @@ game-data-packager (42) UNRELEASED; urgency=medium
     give dpkg a hint that it is the better version
   * freespace2-data Conflicts and Replaces the versions built by scripts
     shipped with fs2-open
+  * wolf3d-v*-data Conflicts and Replaces wolf3d-full-data
 
  -- Simon McVittie <smcv at debian.org>  Sun, 03 May 2015 14:34:00 +0200
 

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