r31772 - in /packages/unstable/rhythmbox/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Nov 22 02:30:39 2011
New Revision: 31772

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31772
Log:
  - Use Breaks instead of Conflicts.
  - Drop old Conflicts from pre-lenny.

Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/control.in

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=31772&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Tue Nov 22 02:30:39 2011
@@ -35,6 +35,8 @@
       required when enabling hal support.
     - Bump Build-Depends on gobject-introspection to (>= 0.10.0).
     - Add Breaks/Replaces to rhythmbox-data to ensure proper upgrades.
+    - Use Breaks instead of Conflicts.
+    - Drop old Conflicts from pre-lenny.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 22 Nov 2011 01:34:07 +0100
 

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=31772&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Tue Nov 22 02:30:39 2011
@@ -84,7 +84,6 @@
          gstreamer0.10-x,
          python-gst0.10 (>= 0.10.1),
          media-player-info [linux-any]
-Conflicts: gnome-control-center (<< 2.15.90)
 Breaks: gvfs (<< 1.4.1-6)
 Recommends: yelp,
             avahi-daemon,
@@ -201,7 +200,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          rhythmbox (= ${binary:Version})
-Conflicts: rhythmbox (<< 0.12.6-4)
+Breaks: rhythmbox (<< 0.12.6-4)
 Replaces: rhythmbox (<< 0.12.6-4)
 Description: burning plugin for rhythmbox music player
  Rhythmbox is a very easy to use music playing and management program

Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=31772&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Tue Nov 22 02:30:39 2011
@@ -79,7 +79,6 @@
          gstreamer0.10-x,
          python-gst0.10 (>= 0.10.1),
          media-player-info [linux-any]
-Conflicts: gnome-control-center (<< 2.15.90)
 Breaks: gvfs (<< 1.4.1-6)
 Recommends: yelp,
             avahi-daemon,
@@ -196,7 +195,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          rhythmbox (= ${binary:Version})
-Conflicts: rhythmbox (<< 0.12.6-4)
+Breaks: rhythmbox (<< 0.12.6-4)
 Replaces: rhythmbox (<< 0.12.6-4)
 Description: burning plugin for rhythmbox music player
  Rhythmbox is a very easy to use music playing and management program