[SCM] sddm packaging branch, master, updated. debian/0.12.0-1-2-g54c6d5e

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 54c6d5e6894ec01e8b54c44eff5a60868af77027
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Fri Sep 11 15:34:33 2015 +0200

    Ensure SDDM waits for Plymouth and getty to quite before starting (Closes: 793637)
---
 debian/sddm.init    | 2 ++
 debian/sddm.service | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/sddm.init b/debian/sddm.init
index 645fa4f..695988a 100644
--- a/debian/sddm.init
+++ b/debian/sddm.init
@@ -41,6 +41,8 @@ do_start_override()
 		log_action_msg "Not starting Simple Desktop Display Manager ($NAME); it is not the default display manager."
 	else
 		[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+		# Wait for plymouth if running
+		[ -x /bin/plymouth ] && /bin/plymouth quit
 		call do_start_cmd
 		case "$?" in
 		  0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
diff --git a/debian/sddm.service b/debian/sddm.service
index 36c6ace..d083e14 100644
--- a/debian/sddm.service
+++ b/debian/sddm.service
@@ -1,7 +1,9 @@
 [Unit]
 Description=Simple Desktop Display Manager
 Documentation=man:sddm(1) man:sddm.conf(5)
-After=systemd-user-sessions.service
+Conflicts=getty at tty1.service plymouth-quit.service
+After=systemd-user-sessions.service getty at tty1.service plymouth-quit.service
+OnFailure=plymouth-quit.service
 
 [Service]
 # temporary safety check until all DMs are converted to correct
@@ -9,3 +11,5 @@ After=systemd-user-sessions.service
 ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/bin/sddm" ]'
 ExecStart=/usr/bin/sddm
 Restart=always
+RestartSec=1s
+EnvironmentFile=-/etc/default/locale

-- 
sddm packaging