[game-data-packager] 05/05: freespace2-data Conflicts and Replaces the versions built by scripts shipped with fs2-open

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

    freespace2-data Conflicts and Replaces the versions built by scripts shipped with fs2-open
---
 data/freespace2.yaml | 4 ++++
 debian/changelog     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/data/freespace2.yaml b/data/freespace2.yaml
index a37fe64..4e0f647 100644
--- a/data/freespace2.yaml
+++ b/data/freespace2.yaml
@@ -21,6 +21,10 @@ copyright: © 1999 Volition, Inc.
 packages:
   freespace2-data:
     install_to: usr/share/games/freespace2-open
+    debian:
+      replaces:
+        - freespace2-data-gog
+        - freespace2-data-volition
     steam:
       id: 273620
       path: common/Freespace 2
diff --git a/debian/changelog b/debian/changelog
index afa561a..a0e756e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,8 @@ game-data-packager (42) UNRELEASED; urgency=medium
     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
+  * freespace2-data Conflicts and Replaces the versions built by scripts
+    shipped with fs2-open
 
  -- 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