summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--debian/lightdm.service3
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e8a7a560..af77ab54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lightdm (1.11.2-0ubuntu2) utopic; urgency=medium
+
+ * Integration plymouth systemd system job with plymouth services.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 17 May 2014 19:18:41 +0100
+
lightdm (1.11.2-0ubuntu1) utopic; urgency=medium
* New upstream release:
diff --git a/debian/control b/debian/control
index 537082b7..fb253ddd 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Depends: ${misc:Depends},
adduser,
libglib2.0-bin,
dbus,
- plymouth (>= 0.8.8-0ubuntu6.1),
+ plymouth (>= 0.8.8-0ubuntu18),
Recommends: xserver-xorg,
unity-greeter | lightdm-greeter | lightdm-kde-greeter,
Conflicts: liblightdm-gobject-0-0,
diff --git a/debian/lightdm.service b/debian/lightdm.service
index 82b885c1..eb23df63 100644
--- a/debian/lightdm.service
+++ b/debian/lightdm.service
@@ -1,7 +1,8 @@
[Unit]
Description=Light Display Manager
Documentation=man:lightdm(1)
-After=systemd-user-sessions.service
+Conflicts=getty@tty7.service plymouth-quit.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
[Service]
# temporary safety check until all DMs are converted to correct