[SCM] sddm packaging branch, master, updated. 948483c715091214b9d0cc10337f5d2fb42b2074

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7e09cd3bfee618353ce96109d96d7ba49d93fb7e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 27 13:30:54 2015 +0100

    Typo in the installinit rule, sync systemd usage with lightdm
---
 debian/rules         |  2 +-
 debian/sddm.postinst |  5 +----
 debian/sddm.service  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index ee9be2c..88ca1ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_systemd_start:
 	dh_systemd_start -psddm --no-start -r sddm.service
 
 override_dh_installinit:
-	dh_installinit --no-start
+	dh_installinit --noscripts
 
 override_dh_installpam:
 	dh_installpam
diff --git a/debian/sddm.postinst b/debian/sddm.postinst
index e479187..c8eded6 100644
--- a/debian/sddm.postinst
+++ b/debian/sddm.postinst
@@ -60,11 +60,8 @@ if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
         elif [ -e "$SERVICE" ]; then
             ln -sf "$SERVICE" "$DEFAULT_SERVICE"
         else
-            echo "WARNING: $SERVICE is the selected default display manager but does not exist" >&2
-            rm -f "$DEFAULT_SERVICE"
+            echo "ERROR: $SERVICE is the selected default display manager but does not exist" >&2
         fi
-    else
-        rm -f "$DEFAULT_SERVICE"
     fi
 fi
 
diff --git a/debian/sddm.service b/debian/sddm.service
new file mode 100644
index 0000000..c149fad
--- /dev/null
+++ b/debian/sddm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Desktop Display Manager
+Documentation=man:sddm(1) man:sddm.conf(5)
+After=systemd-user-sessions.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/bin/sddm" ]'
+ExecStart=/usr/bin/sddm
+Restart=always
+BusName=org.freedesktop.DisplayManager

-- 
sddm packaging