Merge lp:~darkxst/ubuntu/saucy/gdm/lp982889 into lp:ubuntu/saucy/gdm

[Tim Lunn]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-29 10:48:29 +0000
+++ debian/changelog	2013-05-23 08:15:32 +0000
@@ -1,3 +1,12 @@
+gdm (3.6.1-0ubuntu6) saucy; urgency=low
+
+  * Merge changes from lightdm to fix plymouth race (LP: #982889)
+    - lightdm.upstart: Add a start condition on plymouth-ready, and
+      drop conditions already handled by plymouth-splash.
+    - control: Depend on the new plymouth version that provides plymouth-ready.
+
+ -- Tim Lunn <[e-mail]>  Thu, 23 May 2013 17:45:44 +1000
+
 gdm (3.6.1-0ubuntu5) saucy; urgency=low
 
   * Add debian/patches/00git_logind_check.patch: Fix checks for logind.
 
=== modified file 'debian/control'
--- debian/control	2013-04-29 10:48:29 +0000
+++ debian/control	2013-05-23 08:15:32 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>
 Build-Depends: gnome-pkg-tools (>= 0.16.3),
                debhelper (>= 8.1.0),
                cdbs,
@@ -64,6 +64,7 @@
          gnome-session-bin (>= 3.6),
          gnome-settings-daemon (>= 3.2),
          metacity (>= 1:2.34.2),
+         plymouth (>= 0.8.8-0ubuntu6.1),
          policykit-1-gnome,
          upower,
          libpam-systemd,
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-04-29 10:48:29 +0000
+++ debian/control.in	2013-05-23 08:15:32 +0000
@@ -60,6 +60,7 @@
          gnome-session-bin (>= 3.6),
          gnome-settings-daemon (>= 3.2),
          metacity (>= 1:2.34.2),
+         plymouth (>= 0.8.8-0ubuntu6.1),
          policykit-1-gnome,
          upower,
          libpam-systemd,
 
=== modified file 'debian/gdm.upstart'
--- debian/gdm.upstart	2012-08-28 12:26:39 +0000
+++ debian/gdm.upstart	2013-05-23 08:15:32 +0000
@@ -9,9 +9,8 @@
 start on ((filesystem
            and runlevel [!06]
            and started dbus
-           and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
-                or stopped udev-fallback-graphics))
-          or runlevel PREVLEVEL=S)
+           and plymouth-ready)  
+	  or runlevel PREVLEVEL=S)
 
 stop on runlevel [016]