r40115 - in /desktop/experimental/gnome-session/debian: changelog control control.in

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Oct 26 14:33:11 2013
New Revision: 40115

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40115
Log:
merge changes in the unstable branch

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

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=40115&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog	[utf-8] Sat Oct 26 14:33:11 2013
@@ -9,6 +9,13 @@
   * debian/control.in: Update build-depends
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Oct 2013 15:38:28 +0200
+
+gnome-session (3.8.4-3) unstable; urgency=medium
+
+  * debian/control.in:
+    +Break gdm3 < 3.8. Closes: #726498.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 26 Oct 2013 16:12:19 +0200
 
 gnome-session (3.8.4-2) unstable; urgency=low
 

Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=40115&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control	[utf-8] Sat Oct 26 14:33:11 2013
@@ -78,6 +78,7 @@
          gsettings-desktop-schemas,
          upower (>= 0.9.0)
 Conflicts: gnome-session (<< 2.26.1-5)
+Breaks: gdm3 (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at

Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=40115&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in	[utf-8] Sat Oct 26 14:33:11 2013
@@ -73,6 +73,7 @@
          gsettings-desktop-schemas,
          upower (>= 0.9.0)
 Conflicts: gnome-session (<< 2.26.1-5)
+Breaks: gdm3 (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at