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

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Mar 19 00:51:35 2008
New Revision: 15288

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15288
Log:
* Upload to unstable.
* debian/control.in:
  + Add conflicts with rhythmbox (<< 0.11.5) and banshee (<< 0.13.2+dfsg-7)
    as the multimedia keys DBus interface changed.

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=15288&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Wed Mar 19 00:51:35 2008
@@ -1,3 +1,12 @@
+gnome-settings-daemon (2.22.0-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/control.in:
+    + Add conflicts with rhythmbox (<< 0.11.5) and banshee (<< 0.13.2+dfsg-7)
+      as the multimedia keys DBus interface changed.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Mar 2008 01:47:15 +0100
+
 gnome-settings-daemon (2.22.0-2) experimental; urgency=low
 
   * debian/rules:

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=15288&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control Wed Mar 19 00:51:35 2008
@@ -35,6 +35,8 @@
          ${misc:Depends}
 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)
 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=15288&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in Wed Mar 19 00:51:35 2008
@@ -35,6 +35,8 @@
          ${misc:Depends}
 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)
 Description: GNOME settings daemon
  The package contains the GNOME daemon which handles the session settings