r25704 - in /desktop/unstable/gnome-session/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 29 08:04:39 2010
New Revision: 25704

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25704
Log:
Conflict with gnome-splashscreen-manager. Closes: #605111.

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

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=25704&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Mon Nov 29 08:04:39 2010
@@ -1,3 +1,9 @@
+gnome-session (2.30.2-4) UNRELEASED; urgency=low
+
+  * Conflict with gnome-splashscreen-manager. Closes: #605111.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 29 Nov 2010 09:00:42 +0100
+
 gnome-session (2.30.2-3) unstable; urgency=low
 
   * defaults.list: open WebM and MPEG2/TS with totem.

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=25704&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Mon Nov 29 08:04:39 2010
@@ -45,6 +45,7 @@
 Breaks: bug-buddy (<< 2.20),
         xserver-xorg (<< 1:7.4),
         gnome-power-manager (<< 2.28)
+Conflicts: gnome-splashscreen-manager
 Provides: x-session-manager
 Suggests: gnome-user-guide,
           desktop-base,

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=25704&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Mon Nov 29 08:04:39 2010
@@ -40,6 +40,7 @@
 Breaks: bug-buddy (<< 2.20),
         xserver-xorg (<< 1:7.4),
         gnome-power-manager (<< 2.28)
+Conflicts: gnome-splashscreen-manager
 Provides: x-session-manager
 Suggests: gnome-user-guide,
           desktop-base,