Bug#624098: gnome-cards-data conflicts with gnome-games-extra-data

[Jonathan Nieder]

severity 624098 serious
tags 624098 + patch
quit

Hi,

Ernesto Domato wrote:

> gnome-cards-data (1:3.0.1.1-1) conflicts with gnome-games-extra-data (2.30.0-1)
> because the former tries to overwrite '/usr/share/gnome-games-
> common/cards/bonded.svg' that is provided also by the later package.

True.  Fixed by gnome-games-extra-data commit 2be50318 (cards: Add
gnomangelo_bitmap and remove bonded, 2011-03-19).  How about this
patch?

Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
---
 debian/changelog  |    8 ++++++++
 debian/control.in |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f89efb5..4997eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-games (1:3.0.1.1-1.1) local; urgency=low
+
+  * debian/control.in:
+    - gnome-cards-data breaks/replaces old gnome-games-data-extra,
+      which used to provide cards/bonded.svg. Closes: #624098.
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Thu, 05 May 2011 15:39:34 -0500
+
 gnome-games (1:3.0.1.1-1) experimental; urgency=low
 
   * New upstream stable release.
diff --git a/debian/control.in b/debian/control.in
index 39e7d05..c8f76a1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -87,6 +87,8 @@ Depends: ${misc:Depends}
 Conflicts: gnome-games-data (<< 1:2.14.2.1-1),
            gnome-games (<< 1:2.20),
            gnome-hearts (<< 0.1.3-4)
+Breaks: gnome-games-extra-data (<< 3.0.0)
+Replaces: gnome-games-extra-data (<< 3.0.0)
 Description: data files for the GNOME card games
  This package contains pictures of card decks used by the card-based 
  GNOME games. Different themes are provided.
-- 
1.7.5.1