[game-data-packager] 03/05: hexen2-data Conflicts and Replaces hexen2-demo-data, hopefully this will give dpkg a hint that it is the better version

[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 76e12f9c8a2770d22f6fe258af4a00578ffedd8f
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 15 09:56:16 2015 +0100

    hexen2-data Conflicts and Replaces hexen2-demo-data, hopefully this will give dpkg a hint that it is the better version
---
 data/hexen2.yaml | 2 ++
 debian/changelog | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 371d4c8..ed08413 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -34,6 +34,8 @@ packages:
     steam:
       id: 9060
       path: "common/Hexen 2"
+    debian:
+      replaces: heretic2-demo-data
     install_files_from_cksums: |
       2912412704 22704056 data1/pak0.pak
       4210700438 75601170 data1/pak1.pak
diff --git a/debian/changelog b/debian/changelog
index 30bb433..afa561a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,8 @@ game-data-packager (42) UNRELEASED; urgency=medium
     instead of using dh_bash-completion (works around #668254, #785271)
   * For games that recently gained multilingual packages, also try repacking
     files from the non-language-specific location
+  * hexen2-data Conflicts and Replaces hexen2-demo-data, hopefully this will
+    give dpkg a hint that it is the better version
 
  -- 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