[SCM] sddm packaging branch, kubuntu_xenial_archive, updated. debian/0.13.0-1-13-gba3f080
Philip Muškovac
yofel-guest at moszumanska.debian.org
Tue Jan 5 15:53:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=f5abab7
The following commit has been merged in the kubuntu_xenial_archive branch:
commit f5abab73cd8484ec534b42fe06a34ee3fc37f234
Author: Philip Muškovac <yofel at gmx.net>
Date: Tue Jan 5 16:40:36 2016 +0100
Refresh patch to remove fuzz
---
debian/patches/kubuntu_minimum_vt.diff | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/debian/patches/kubuntu_minimum_vt.diff b/debian/patches/kubuntu_minimum_vt.diff
index 5182646..1f35ced 100644
--- a/debian/patches/kubuntu_minimum_vt.diff
+++ b/debian/patches/kubuntu_minimum_vt.diff
@@ -5,23 +5,23 @@ Origin: kubuntu
Last-Update: 2015-03-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: sddm-0.11.0/CMakeLists.txt
+Index: b/CMakeLists.txt
===================================================================
---- sddm-0.11.0.orig/CMakeLists.txt
-+++ sddm-0.11.0/CMakeLists.txt
-@@ -111,7 +111,7 @@ if(SYSTEMD_FOUND)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,7 @@ if(SYSTEMD_FOUND)
+ string(REGEX REPLACE "[
]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
+ endif()
- 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 1)
+ 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()
-Index: sddm-0.11.0/services/sddm.service.in
+Index: b/services/sddm.service.in
===================================================================
---- sddm-0.11.0.orig/services/sddm.service.in
-+++ sddm-0.11.0/services/sddm.service.in
+--- a/services/sddm.service.in
++++ b/services/sddm.service.in
@@ -1,7 +1,6 @@
[Unit]
Description=Simple Desktop Display Manager
--
sddm packaging
More information about the pkg-kde-commits
mailing list