[SCM] sddm packaging branch, master, updated. debian/0.11.0-4-15-g5836041

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 9fb91dbf394f10a38851a5d9eeceb6ccdbeb7a73
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sun Sep 6 00:12:08 2015 +0200

    Ensure Xsession script is marked as executable
---
 debian/rules        | 7 +++++++
 debian/sddm.install | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4137af1..f518607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,15 @@ override_dh_installinit:
 	dh_installinit --noscripts
 
 override_dh_install:
+	# not installed, as the Debian version is used instead
+	rm -f $(CURDIR)/debian/tmp/lib/systemd/system/sddm.service
 	dh_install --list-missing
 
+override_dh_fixperms:
+	# ensure script is marked as executable
+	chmod +x $(CURDIR)/debian/sddm/etc/sddm/Xsession
+	dh_fixperms
+
 override_dh_installpam:
 	dh_installpam
 	dh_installpam --name=sddm-autologin
diff --git a/debian/sddm.install b/debian/sddm.install
index 72c96d9..cbe2d64 100644
--- a/debian/sddm.install
+++ b/debian/sddm.install
@@ -1,5 +1,3 @@
-# not installed, as the Debian version is used instead
-#lib/systemd/system/sddm.service
 debian/Xsession etc/sddm/
 etc/dbus-1/system.d/sddm_org.freedesktop.DisplayManager.conf
 etc/pam.d

-- 
sddm packaging