[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-4-2-g57ae3fb

[Vincent Legout]

The following commit has been merged in the master branch:
commit 71f2b0cf78914bebe3097b7d7be4cc5ef3db9f1d
Author: Vincent Legout <vincent at legout.info>
Date:   Wed Dec 23 11:33:03 2009 +0100

    Add conflicts between grhino and grhino-data

diff --git a/debian/changelog b/debian/changelog
index 2a770be..2d47900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grhino (0.16.0-5) UNRELEASED; urgency=low
+
+  * grhino-data conflicts with grhino << 0.16.0-4 (Closes: #561523)
+
+ -- Vincent Legout <vincent at legout.info>  Wed, 23 Dec 2009 11:04:03 +0100
+
 grhino (0.16.0-4) unstable; urgency=low
 
   * New maintainer:
diff --git a/debian/control b/debian/control
index 9dd748a..520aa62 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Package: grhino-data
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: quarry
+Conflicts: grhino (<< 0.16.0-4)
+Replaces: grhino (<< 0.16.0-4)
 Description: othello/reversi boardgame - data-files
  grhino, or rhino its former name, is an Othello/Reversi game.  What
  distinguish grhino from most other Othello games is that grhino is

-- 
Packaging for grhino