r44144 - in /desktop/unstable/gdm3/debian: changelog control control.in

[smcv at users.alioth.debian.org]

Author: smcv
Date: Thu Mar  5 21:34:18 2015
New Revision: 44144

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44144
Log:
* Team upload.
* gdm3 Conflicts/Replaces: gdm again, to ensure that obsolete gdm packages
  from squeeze get cleaned up by upgrading wheezy to jessie
  (Closes: #774889)

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

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=44144&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Thu Mar  5 21:34:18 2015
@@ -1,3 +1,12 @@
+gdm3 (3.14.1-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * gdm3 Conflicts/Replaces: gdm again, to ensure that obsolete gdm packages
+    from squeeze get cleaned up by upgrading wheezy to jessie
+    (Closes: #774889)
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 05 Mar 2015 21:30:33 +0000
+
 gdm3 (3.14.1-3) unstable; urgency=medium
 
   * 18_all_displays_transient.patch: fix autologin for the initial 

Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=44144&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/control	[utf-8] Thu Mar  5 21:34:18 2015
@@ -91,6 +91,8 @@
 Suggests: libpam-gnome-keyring,
           gnome-orca
 Provides: x-display-manager
+Conflicts: gdm
+Replaces: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
         gnome-orca (<< 2.30.0-2),

Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=44144&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in	[utf-8] Thu Mar  5 21:34:18 2015
@@ -87,6 +87,8 @@
 Suggests: libpam-gnome-keyring,
           gnome-orca
 Provides: x-display-manager
+Conflicts: gdm
+Replaces: gdm
 Breaks: gnome-panel (<< 3.0),
         gnome-screensaver (<< 2.17.7),
         gnome-orca (<< 2.30.0-2),