[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=b58997f

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

    Refresh remaining patches
---
 debian/patches/default_path.diff       | 22 ++++++++++++++++++++++
 debian/patches/kubuntu_use_breeze.diff |  6 ++----
 debian/patches/sddm_systemctl.diff     | 10 ++++------
 debian/patches/series                  |  7 ++-----
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/debian/patches/default_path.diff b/debian/patches/default_path.diff
new file mode 100644
index 0000000..6a544ac
--- /dev/null
+++ b/debian/patches/default_path.diff
@@ -0,0 +1,22 @@
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -73,7 +73,7 @@
+                                                                                                           "A script to execute when starting the desktop session"));
+         );
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH"));
++            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin"),                        _S("Default $PATH"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Hidden users"));
+--- a/data/man/sddm.conf.rst.in
++++ b/data/man/sddm.conf.rst.in
+@@ -114,7 +114,7 @@
+ 
+ `DefaultPath=`
+ 	Default path to set after successfully logging in.
+-	Default value is "/bin:/usr/bin:/usr/local/bin".
++	Default value is "/bin:/usr/bin".
+ 
+ `MinimumUid=`
+ 	Minimum user id of the users to be listed in the
diff --git a/debian/patches/kubuntu_use_breeze.diff b/debian/patches/kubuntu_use_breeze.diff
index a36c86a..2bfd6db 100644
--- a/debian/patches/kubuntu_use_breeze.diff
+++ b/debian/patches/kubuntu_use_breeze.diff
@@ -1,7 +1,5 @@
-Index: sddm-0.9.0/src/common/Configuration.h
-===================================================================
---- sddm-0.9.0.orig/src/common/Configuration.h	2014-08-02 17:09:49.000000000 +0200
-+++ sddm-0.9.0/src/common/Configuration.h	2014-08-19 17:53:52.585934075 +0200
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
 @@ -46,7 +46,7 @@
          //      Name   Entries (but it's a regular class again)
          Section(Theme,
diff --git a/debian/patches/sddm_systemctl.diff b/debian/patches/sddm_systemctl.diff
index e3004a7..5f3b924 100644
--- a/debian/patches/sddm_systemctl.diff
+++ b/debian/patches/sddm_systemctl.diff
@@ -1,11 +1,9 @@
-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)
+@@ -132,8 +132,8 @@
+     endif()
+ 
+     set(MINIMUM_VT 1)
 -    set(HALT_COMMAND "/usr/bin/systemctl poweroff")
 -    set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
 +    set(HALT_COMMAND "/bin/systemctl poweroff")
diff --git a/debian/patches/series b/debian/patches/series
index 3a61ff2..8ca663d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 kubuntu_use_breeze.diff
-kubuntu_dbus-config-rename.diff
-kubuntu_minimum_vt.diff
-upstream_add-graphical.target.diff
-libsystemd.diff
+add-graphical.target.diff
 sddm_systemctl.diff
-default_path
+default_path.diff

-- 
sddm packaging