r15311 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Mar 19 09:47:39 2008
New Revision: 15311

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15311
Log:
* debian/control.in:
  + Also conflict with totem (<< 2.22.0) for the same reason.

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

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=15311&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Wed Mar 19 09:47:39 2008
@@ -1,3 +1,10 @@
+gnome-settings-daemon (2.22.0-4) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    + Also conflict with totem (<< 2.22.0) for the same reason.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Mar 2008 10:47:07 +0100
+
 gnome-settings-daemon (2.22.0-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=15311&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control Wed Mar 19 09:47:39 2008
@@ -36,7 +36,8 @@
 Replaces: capplets-data (<< 1:2.21.5),
           gnome-control-center (<< 1:2.21.5)
 Conflicts: rhythmbox (<< 0.11.5),
-           banshee (<< 0.13.2+dfsg-7)
+           banshee (<< 0.13.2+dfsg-7),
+           totem (<< 2.22.0)
 Description: GNOME settings daemon
  The package contains the GNOME daemon which handles the session settings
 

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=15311&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in Wed Mar 19 09:47:39 2008
@@ -36,7 +36,8 @@
 Replaces: capplets-data (<< 1:2.21.5),
           gnome-control-center (<< 1:2.21.5)
 Conflicts: rhythmbox (<< 0.11.5),
-           banshee (<< 0.13.2+dfsg-7)
+           banshee (<< 0.13.2+dfsg-7),
+           totem (<< 2.22.0)
 Description: GNOME settings daemon
  The package contains the GNOME daemon which handles the session settings