r26022 - in /desktop/experimental/libgnome-media-profiles/debian: changelog control control.in

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Dec 18 21:35:32 2010
New Revision: 26022

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26022
Log:
Correct conflicts

Modified:
    desktop/experimental/libgnome-media-profiles/debian/changelog
    desktop/experimental/libgnome-media-profiles/debian/control
    desktop/experimental/libgnome-media-profiles/debian/control.in

Modified: desktop/experimental/libgnome-media-profiles/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/changelog?rev=26022&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/changelog [utf-8] Sat Dec 18 21:35:32 2010
@@ -2,6 +2,7 @@
 
   * Initial debian packaging
   * Add b-d on intltool
+  * debian/control.in: Conflict with gnome-media-common, not gnome-media
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 18 Dec 2010 21:19:59 +0000
 

Modified: desktop/experimental/libgnome-media-profiles/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/control?rev=26022&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/control [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/control [utf-8] Sat Dec 18 21:35:32 2010
@@ -47,8 +47,8 @@
 Package: gnome-media-profiles
 Section: gnome
 Architecture: any
-Conflicts: gnome-media (<< 2.91)
-Replaces: gnome-media (<< 2.91)
+Conflicts: gnome-media-common (<< 2.91)
+Replaces: gnome-media-common (<< 2.91)
 Depends: libgnome-media-profiles-3.0 (= ${binary:Version}),
          ${misc:Depends}
 Description: GNOME Media Profiles library

Modified: desktop/experimental/libgnome-media-profiles/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnome-media-profiles/debian/control.in?rev=26022&op=diff
==============================================================================
--- desktop/experimental/libgnome-media-profiles/debian/control.in [utf-8] (original)
+++ desktop/experimental/libgnome-media-profiles/debian/control.in [utf-8] Sat Dec 18 21:35:32 2010
@@ -42,8 +42,8 @@
 Package: gnome-media-profiles
 Section: gnome
 Architecture: any
-Conflicts: gnome-media (<< 2.91)
-Replaces: gnome-media (<< 2.91)
+Conflicts: gnome-media-common (<< 2.91)
+Replaces: gnome-media-common (<< 2.91)
 Depends: libgnome-media-profiles-3.0 (= ${binary:Version}),
          ${misc:Depends}
 Description: GNOME Media Profiles library