[SCM] sddm packaging branch, master, updated. debian/0.12.0-4-4-gb50b826

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit b50b826a4809b85270d5adc026b6d28fcdbb47c5
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sun Oct 25 17:04:16 2015 +0100

    Fix deadlock when waiting for Plymouth to quit
    
    This resolves http://tracker.tanglu.org/T167 on Tanglu.
---
 debian/sddm.service | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/sddm.service b/debian/sddm.service
index ff827f6..28fa8e3 100644
--- a/debian/sddm.service
+++ b/debian/sddm.service
@@ -4,7 +4,11 @@ Documentation=man:sddm(1) man:sddm.conf(5)
 # Change this if you want to start sddm in a different tty
 Conflicts=getty at tty7.service
 After=getty at tty7.service
+
+# Ordering
+Conflicts=plymouth-quit-wait.service
 After=systemd-user-sessions.service plymouth-start.service plymouth-quit-wait.service
+OnFailure=plymouth-quit.service
 
 [Service]
 # temporary safety check until all DMs are converted to correct

-- 
sddm packaging