[SCM] sddm packaging branch, master, updated. debian/0.11.0-4-16-g89489fb

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 89489fb33f5cdd0fcabee09943a496058f04fe6c
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sun Sep 6 00:25:31 2015 +0200

    trivial: Fix Git's bogus automatic merge
    
    That happens when you rebase-on-pull ;-)
---
 debian/rules | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index f518607..c6533ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,14 +37,10 @@ override_dh_install:
 
 override_dh_fixperms:
 	# ensure script is marked as executable
-	chmod +x $(CURDIR)/debian/sddm/etc/sddm/Xsession
+	chmod +x 755 $(CURDIR)/debian/sddm/etc/sddm/Xsession
 	dh_fixperms
 
 override_dh_installpam:
 	dh_installpam
 	dh_installpam --name=sddm-autologin
 	dh_installpam --name=sddm-greeter
-
-override_dh_fixperms:
-	dh_fixperms
-	chmod +x 755 debian/sddm/etc/sddm/Xsession

-- 
sddm packaging