[SCM] sddm packaging branch, kubuntu_unstable, updated. ubuntu/0.13.0-1ubuntu1-13-g6b29e57

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 6b29e571b5e575cf2cf16925e2682e1af895bb83
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jan 6 17:26:42 2016 +0100

    Update 04_set_default_path.diff
---
 debian/patches/04_set_default_path.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
index f82f286..d963551 100644
--- a/debian/patches/04_set_default_path.diff
+++ b/debian/patches/04_set_default_path.diff
@@ -12,7 +12,7 @@ Last-Update: 2015-09-14
 ---
 --- a/data/man/sddm.conf.rst.in
 +++ b/data/man/sddm.conf.rst.in
-@@ -114,7 +114,7 @@
+@@ -133,7 +133,7 @@
  
  `DefaultPath=`
  	Default path to set after successfully logging in.
@@ -23,12 +23,12 @@ Last-Update: 2015-09-14
  	Minimum user id of the users to be listed in the
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
-@@ -72,7 +72,7 @@
-                                                                                                           "A script to execute when starting the desktop session"));
+@@ -77,7 +77,7 @@
          );
+ 
          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(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin"),                        _S("Default $PATH for logged in users"));
              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"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));

-- 
sddm packaging