r16323 - in /desktop/unstable/gnome-games/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jun 23 20:41:22 2008
New Revision: 16323

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16323
Log:
  Uses versioned conflicts to prevent the conflict with gnome-games 
  itself.

Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/control
    desktop/unstable/gnome-games/debian/control.in

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=16323&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog (original)
+++ desktop/unstable/gnome-games/debian/changelog Mon Jun 23 20:41:22 2008
@@ -1,6 +1,8 @@
 gnome-games (1:2.22.2.1-2) unstable; urgency=low
 
   * gnome-games-data conflicts with glchess and gnome-sudoku.
+    Uses versioned conflicts to prevent the conflict with gnome-games 
+    itself.
     Closes: #487728.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 23 Jun 2008 22:06:40 +0200

Modified: desktop/unstable/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control?rev=16323&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control (original)
+++ desktop/unstable/gnome-games/debian/control Mon Jun 23 20:41:22 2008
@@ -90,8 +90,8 @@
          gnome-cards-data (<< ${gnome:NextVersion})
 Conflicts: gnome-games (<= 1:2.10.1-2),
            gnome-icon-theme (<< 2.14),
-           glchess,
-           gnome-sudoku
+           glchess (<< 2),
+           gnome-sudoku (<< 2)
 Replaces: gnome-card-games,
           gnome-games-locale,
           glchess,

Modified: desktop/unstable/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control.in?rev=16323&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control.in (original)
+++ desktop/unstable/gnome-games/debian/control.in Mon Jun 23 20:41:22 2008
@@ -90,8 +90,8 @@
          gnome-cards-data (<< ${gnome:NextVersion})
 Conflicts: gnome-games (<= 1:2.10.1-2),
            gnome-icon-theme (<< 2.14),
-           glchess,
-           gnome-sudoku
+           glchess (<< 2),
+           gnome-sudoku (<< 2)
 Replaces: gnome-card-games,
           gnome-games-locale,
           glchess,