[SCM] sddm packaging branch, master, updated. debian/0.11.0-2-4-gc53c772

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6c2b3630d95d90383eef498fe33e28854d0593d6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jul 18 21:03:14 2015 +0200

    Fix systemctl path. (Closes: #792401)
---
 debian/changelog                   |  2 ++
 debian/patches/sddm_systemctl.diff | 15 +++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 188b13b..97c3357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sddm (0.11.0-3~) UNRELEASED; urgency=medium
   * Transition to libsystemd-dev. (Closes: #792400) Thanks to Michael
     Biebl
   * New patch: libsystemd.diff
+  * Fix systemctl path. (Closes: #792401) Thanks to Michael Biebl
+  * New patch: sddm_systemctl.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jul 2015 20:39:32 +0200
 
diff --git a/debian/patches/sddm_systemctl.diff b/debian/patches/sddm_systemctl.diff
new file mode 100644
index 0000000..e3004a7
--- /dev/null
+++ b/debian/patches/sddm_systemctl.diff
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf3fb70..e0306dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,8 +112,8 @@ if(SYSTEMD_FOUND)
+     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
+     string(REGEX REPLACE "[ 	
]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
+     set(MINIMUM_VT 7)
+-    set(HALT_COMMAND "/usr/bin/systemctl poweroff")
+-    set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
++    set(HALT_COMMAND "/bin/systemctl poweroff")
++    set(REBOOT_COMMAND "/bin/systemctl reboot")
+ else()
+     set(SYSTEMD_FOUND 0)
+     set(MINIMUM_VT 7)
diff --git a/debian/patches/series b/debian/patches/series
index 83873e0..e3ba006 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ kubuntu_dbus-config-rename.diff
 kubuntu_minimum_vt.diff
 upstream_add-graphical.target.diff
 libsystemd.diff
+sddm_systemctl.diff

-- 
sddm packaging