[SCM] sddm packaging branch, master, updated. debian/0.12.0-2-6-g238bd96

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b4b91775e9f4d84213c270069bd282e2a2050a5f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 19:21:27 2015 +0200

    Re add patch: 04_set_default_path.diff
---
 debian/changelog                        |  1 +
 debian/patches/04_set_default_path.diff | 38 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1b95a0..7ee6f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sddm (0.12.0-3~1) UNRELEASED; urgency=medium
 
   * Update service file, run after plymouth-quit-wait.
+  * Re add patch: 04_set_default_path.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Sep 2015 18:39:37 +0200
 
diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
new file mode 100644
index 0000000..d36b96f
--- /dev/null
+++ b/debian/patches/04_set_default_path.diff
@@ -0,0 +1,38 @@
+Description: Change the default PATH
+ The configured default PATH is used in the parts that run as root, the
+ greeter and for the user  sessions, so its better to have an spartan default.
+ .
+ At the same time, for the zsh users this spartan version gets expanded thanks
+ to the default global zshenv, while exporting a different value in the
+ Xsession script would be overriding the users configurations in their local
+ zshenv.
+Author: Maximiliano Curia <maxy at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-09-14
+---
+Index: sddm/data/man/sddm.conf.rst.in
+===================================================================
+--- sddm.orig/data/man/sddm.conf.rst.in	2015-09-14 18:15:17.000000000 +0200
++++ sddm/data/man/sddm.conf.rst.in	2015-09-14 19:09:48.946429964 +0200
+@@ -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
+Index: sddm/src/common/Configuration.h
+===================================================================
+--- sddm.orig/src/common/Configuration.h	2015-09-14 19:04:20.239415239 +0200
++++ sddm/src/common/Configuration.h	2015-09-14 19:09:40.058781080 +0200
+@@ -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"));
diff --git a/debian/patches/series b/debian/patches/series
index ffead09..eb3a11c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_sddm_systemctl.diff
 02_kubuntu_use_breeze.diff
 03_vt7-minimum-vt.diff
+04_set_default_path.diff

-- 
sddm packaging