[SCM] sddm packaging branch, master, updated. debian/0.12.0-2-6-g238bd96

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=1b9fbce

The following commit has been merged in the master branch:
commit 1b9fbce80d6919b26cac14329353386239d78a6a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 17:57:26 2015 +0200

    Update service file, run after plymouth-quit-wait.
---
 debian/changelog    | 2 +-
 debian/sddm.service | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e44b4b4..9d432c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 sddm (0.12.0-3~) UNRELEASED; urgency=medium
 
-  * 
+  * Update service file, run after plymouth-quit-wait.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Sep 2015 17:48:02 +0200
 
diff --git a/debian/sddm.service b/debian/sddm.service
index 97bf24d..ff827f6 100644
--- a/debian/sddm.service
+++ b/debian/sddm.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Simple Desktop Display Manager
 Documentation=man:sddm(1) man:sddm.conf(5)
-Conflicts=getty at tty7.service plymouth-quit.service
-After=systemd-user-sessions.service getty at tty7.service plymouth-quit.service
-OnFailure=plymouth-quit.service
+# Change this if you want to start sddm in a different tty
+Conflicts=getty at tty7.service
+After=getty at tty7.service
+After=systemd-user-sessions.service plymouth-start.service plymouth-quit-wait.service
 
 [Service]
 # temporary safety check until all DMs are converted to correct

-- 
sddm packaging