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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Nov 22 01:57:32 2011
New Revision: 31769

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31769
Log:
Add Breaks/Replaces to rhythmbox-data to ensure proper upgrades.

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=31769&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Tue Nov 22 01:57:32 2011
@@ -32,6 +32,7 @@
     - Mark libdbus-glib-1-dev Build-Depends as !linux-any, as it is only
       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.
 
  -- 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=31769&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Tue Nov 22 01:57:32 2011
@@ -110,6 +110,8 @@
 Architecture: all
 Depends: ${misc:Depends},
 Recommends: rhythmbox
+Breaks: rhythmbox (<< 2.90.1~git20111117.f101562-1)
+Replaces: rhythmbox (<< 2.90.1~git20111117.f101562-1)
 Description: data files for rhythmbox
  Rhythmbox is a very easy to use music playing and management program
  which supports a wide range of audio formats (including mp3 and ogg).
@@ -157,7 +159,7 @@
          python-gnomekeyring,
          zeitgeist-core
 Recommends: nautilus-sendto
-Conflicts: rhythmbox (<< 0.12.6-4)
+Breaks: rhythmbox (<< 0.12.6-4)
 Replaces: rhythmbox (<< 0.12.6-4)
 Description: plugins 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=31769&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Tue Nov 22 01:57:32 2011
@@ -105,6 +105,8 @@
 Architecture: all
 Depends: ${misc:Depends},
 Recommends: rhythmbox
+Breaks: rhythmbox (<< 2.90.1~git20111117.f101562-1)
+Replaces: rhythmbox (<< 2.90.1~git20111117.f101562-1)
 Description: data files for rhythmbox
  Rhythmbox is a very easy to use music playing and management program
  which supports a wide range of audio formats (including mp3 and ogg).
@@ -152,7 +154,7 @@
          python-gnomekeyring,
          zeitgeist-core
 Recommends: nautilus-sendto
-Conflicts: rhythmbox (<< 0.12.6-4)
+Breaks: rhythmbox (<< 0.12.6-4)
 Replaces: rhythmbox (<< 0.12.6-4)
 Description: plugins for rhythmbox music player
  Rhythmbox is a very easy to use music playing and management program