[SCM] sddm packaging branch, master, updated. debian/0.11.0-4-6-g8426fb4

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 8426fb4c8f018b9c9eb0bccbb352145efe42cc1d
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sat Sep 5 23:12:32 2015 +0200

    debian/rules: Compile with DBUS_CONFIG_FILENAME set to non-conflicting name
---
 debian/rules | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2b3a625..611722d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,15 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+SDDM_CMAKE_ARGS = -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm \
+	    -DSESSION_COMMAND="/etc/sddm/Xsession" \
+	    -DDBUS_CONFIG_FILENAME="sddm_org.freedesktop.DisplayManager.conf"
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   WITH_SYSTEMD := --with systemd
 else
-  CMAKE_ARGS += -DNO_SYSTEMD=ON -DENABLE_JOURNALD=OFF
+  SDDM_CMAKE_ARGS += -DNO_SYSTEMD=ON -DENABLE_JOURNALD=OFF
 endif
 
 %:
@@ -17,10 +22,7 @@ override_dh_strip:
 	dh_strip --dbg-package=sddm-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-	    -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm \
-	    -DSESSION_COMMAND="/etc/sddm/Xsession" \
-	    ${CMAKE_ARGS}
+	dh_auto_configure -- ${SDDM_CMAKE_ARGS}
 
 override_dh_systemd_start:
 	dh_systemd_start -psddm --no-start -r sddm.service

-- 
sddm packaging