[SCM] sddm packaging branch, kubuntu_unstable, updated. 017dfbb5db89168893995847ba0099ccacec1c34

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 017dfbb5db89168893995847ba0099ccacec1c34
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Apr 16 10:10:53 2015 +0200

    remove config rename patch; upstream implement through cmake args landed
---
 debian/patches/kubuntu_dbus-config-rename.diff | 13 -------------
 debian/patches/series                          |  1 -
 debian/rules                                   |  5 ++++-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/patches/kubuntu_dbus-config-rename.diff b/debian/patches/kubuntu_dbus-config-rename.diff
deleted file mode 100644
index 1efc5de..0000000
--- a/debian/patches/kubuntu_dbus-config-rename.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
-===================================================================
---- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt	2014-07-18 11:36:58.974892509 +0200
-+++ sddm-0.1.0+git20140718/data/CMakeLists.txt	2014-07-18 11:36:58.970892509 +0200
-@@ -1,7 +1,7 @@
- install(DIRECTORY   "faces"                             DESTINATION "${DATA_INSTALL_DIR}")
- install(DIRECTORY   "flags"                             DESTINATION "${DATA_INSTALL_DIR}")
- 
--install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}")
-+install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
- 
- install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
diff --git a/debian/patches/series b/debian/patches/series
index 3952b32..09ee196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 kubuntu_use_breeze.diff
-kubuntu_dbus-config-rename.diff
 kubuntu_minimum_vt.diff
 upstream_add-graphical.target.diff
 kubuntu_nvidia-prime.diff
diff --git a/debian/rules b/debian/rules
index ee9be2c..6620933 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,10 @@ override_dh_strip:
 	dh_strip --dbg-package=sddm-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DUSE_QT5=TRUE -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm
+	dh_auto_configure -- \
+		-DUSE_QT5=TRUE \
+		-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm \
+		-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf
 
 override_dh_systemd_start:
 	dh_systemd_start -psddm --no-start -r sddm.service

-- 
sddm packaging