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

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr 19 20:18:51 2008
New Revision: 15701

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15701
Log:
Conflict against gnome-control-center < 2.21.5. Closes: #476802.

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=15701&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Sat Apr 19 20:18:51 2008
@@ -1,3 +1,9 @@
+gnome-settings-daemon (2.22.1-2) unstable; urgency=high
+
+  * Conflict against gnome-control-center < 2.21.5. Closes: #476802.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 19 Apr 2008 22:17:49 +0200
+
 gnome-settings-daemon (2.22.1-1) unstable; urgency=low
 
   * New upstream bugfix release:

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=15701&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control Sat Apr 19 20:18:51 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: extra
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
                dpkg-dev (>= 1.13.19),
@@ -37,7 +37,8 @@
           gnome-control-center (<< 1:2.21.5)
 Conflicts: rhythmbox (<< 0.11.5),
            banshee (<< 0.13.2+dfsg-7),
-           totem (<< 2.22.0)
+           totem (<< 2.22.0),
+           gnome-control-center (<< 1:2.21.5)
 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=15701&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in Sat Apr 19 20:18:51 2008
@@ -37,7 +37,8 @@
           gnome-control-center (<< 1:2.21.5)
 Conflicts: rhythmbox (<< 0.11.5),
            banshee (<< 0.13.2+dfsg-7),
-           totem (<< 2.22.0)
+           totem (<< 2.22.0),
+           gnome-control-center (<< 1:2.21.5)
 Description: GNOME settings daemon
  The package contains the GNOME daemon which handles the session settings