r14668 - in /desktop/unstable/control-center/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Feb 18 19:21:30 2008
New Revision: 14668

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14668
Log:
* Conflict against gnome-session << 2.20.3-2 because earlier versions 
  require the dbus service file.

Modified:
    desktop/unstable/control-center/debian/changelog
    desktop/unstable/control-center/debian/control
    desktop/unstable/control-center/debian/control.in

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=14668&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Mon Feb 18 19:21:30 2008
@@ -1,3 +1,10 @@
+control-center (1:2.20.3-3) UNRELEASED; urgency=low
+
+  * Conflict against gnome-session << 2.20.3-2 because earlier versions 
+    require the dbus service file.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 18 Feb 2008 20:22:37 +0100
+
 control-center (1:2.20.3-2) unstable; urgency=low
 
   * capplets-data.install: don’t install the dbus service file, as g-s-d

Modified: desktop/unstable/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control?rev=14668&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control (original)
+++ desktop/unstable/control-center/debian/control Mon Feb 18 19:21:30 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Marco Cabizza <marco87 at gmail.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.7.3
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
@@ -76,7 +76,7 @@
             gnome-session
 Replaces: capplets
 Conflicts: capplets,
-           gnome-session (<< 2.16)
+           gnome-session (<< 2.20.3-2)
 Suggests: esound-clients,
           gnome-screensaver | xscreensaver,
           xbase-clients,

Modified: desktop/unstable/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/control.in?rev=14668&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/control.in (original)
+++ desktop/unstable/control-center/debian/control.in Mon Feb 18 19:21:30 2008
@@ -76,7 +76,7 @@
             gnome-session
 Replaces: capplets
 Conflicts: capplets,
-           gnome-session (<< 2.16)
+           gnome-session (<< 2.20.3-2)
 Suggests: esound-clients,
           gnome-screensaver | xscreensaver,
           xbase-clients,