r45826 - in /desktop/experimental/gdm3/debian: changelog control control.in

[bigon at users.alioth.debian.org]

Author: bigon
Date: Fri Sep  4 13:54:33 2015
New Revision: 45826

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45826
Log:
debian/control.in: Move xserver-xorg-core (<< 2:1.17.2-2~) from Conflicts
to Breaks

Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=45826&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Fri Sep  4 13:54:33 2015
@@ -1,3 +1,10 @@
+gdm3 (3.17.90-2) UNRELEASED; urgency=medium
+
+  * debian/control.in: Move xserver-xorg-core (<< 2:1.17.2-2~) from Conflicts
+    to Breaks
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 04 Sep 2015 15:53:51 +0200
+
 gdm3 (3.17.90-1) experimental; urgency=medium
 
   * New upstream beta release.

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=45826&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Fri Sep  4 13:54:33 2015
@@ -88,12 +88,13 @@
 Suggests: libpam-gnome-keyring,
           gnome-orca
 Provides: x-display-manager
-Conflicts: gdm, xserver-xorg-core (<< 2:1.17.2-2~)
+Conflicts: gdm
 Replaces: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
         gnome-orca (<< 2.30.0-2),
-        gnome-control-center (<< 3.0)
+        gnome-control-center (<< 3.0),
+        xserver-xorg-core (<< 2:1.17.2-2~)
 Description: GNOME Display Manager
  GDM provides the equivalent of a "login:" prompt for X displays: it 
  asks for a login and starts graphical sessions.

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=45826&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Fri Sep  4 13:54:33 2015
@@ -84,12 +84,13 @@
 Suggests: libpam-gnome-keyring,
           gnome-orca
 Provides: x-display-manager
-Conflicts: gdm, xserver-xorg-core (<< 2:1.17.2-2~)
+Conflicts: gdm
 Replaces: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
         gnome-orca (<< 2.30.0-2),
-        gnome-control-center (<< 3.0)
+        gnome-control-center (<< 3.0),
+        xserver-xorg-core (<< 2:1.17.2-2~)
 Description: GNOME Display Manager
  GDM provides the equivalent of a "login:" prompt for X displays: it 
  asks for a login and starts graphical sessions.