diff -Nru gdm-3.0.4/debian/changelog gdm-3.0.4/debian/changelog
--- gdm-3.0.4/debian/changelog	2013-03-28 22:11:15.000000000 +0000
+++ gdm-3.0.4/debian/changelog	2013-07-09 10:44:10.000000000 +0000
@@ -1,3 +1,12 @@
+gdm (3.0.4-0ubuntu15.2) precise; 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 <tim@feathertop.org>  Thu, 23 May 2013 17:45:44 +1000
+
 gdm (3.0.4-0ubuntu15.1) precise-proposed; urgency=low
 
   * debian/gdm.pam, debian/gdm-autologin.pam:
diff -Nru gdm-3.0.4/debian/control gdm-3.0.4/debian/control
--- gdm-3.0.4/debian/control	2013-03-28 22:12:39.000000000 +0000
+++ gdm-3.0.4/debian/control	2013-07-09 10:44:23.000000000 +0000
@@ -39,6 +39,7 @@
                libxinerama-dev,
                libselinux1-dev [linux-any],
                libattr1-dev [linux-any],
+               plymouth (>= 0.8.2-2ubuntu31.1),
                iso-codes,
                docbook-xml,
                gsettings-desktop-schemas
diff -Nru gdm-3.0.4/debian/control.in gdm-3.0.4/debian/control.in
--- gdm-3.0.4/debian/control.in	2012-01-31 16:48:01.000000000 +0000
+++ gdm-3.0.4/debian/control.in	2013-07-09 10:42:32.000000000 +0000
@@ -35,6 +35,7 @@
                libxinerama-dev,
                libselinux1-dev [linux-any],
                libattr1-dev [linux-any],
+               plymouth (>= 0.8.2-2ubuntu31.1),
                iso-codes,
                docbook-xml,
                gsettings-desktop-schemas
diff -Nru gdm-3.0.4/debian/gdm.upstart gdm-3.0.4/debian/gdm.upstart
--- gdm-3.0.4/debian/gdm.upstart	2012-01-31 16:48:01.000000000 +0000
+++ gdm-3.0.4/debian/gdm.upstart	2013-07-09 10:42:32.000000000 +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]