[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-64-geaa5f0b

[Simon Quigley]

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

The following commit has been merged in the master branch:
commit aa8f055bf2fef08aed0a0990c95b53f5d9235526
Author: Scarlett Clark <sgclark at kde.org>
Date:   Tue Oct 31 19:30:32 2017 +0100

    Disable path patch, order was adjust upstream.
---
 debian/patches/04_set_default_path.diff | 39 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
deleted file mode 100644
index b99ce49..0000000
--- a/debian/patches/04_set_default_path.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Maximiliano Curia <maxy at debian.org>
-Date: Fri, 11 Nov 2016 09:45:34 +0100
-Subject: 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.
-Forwarded: not-needed
-Last-Update: 2017-10-31
-diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
-index 93835f9..0225055 100644
---- a/data/man/sddm.conf.rst.in
-+++ b/data/man/sddm.conf.rst.in
-@@ -165,7 +165,7 @@
-
- `DefaultPath=`
-        Default path to set after successfully logging in.
--       Default value is "/usr/local/bin:/usr/bin:/bin".
-+       Default value is "/bin:/usr/bin".
-
- `MinimumUid=`
-        Minimum user id of the users to be listed in the
-diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index cfca12b..b200d27 100644
---- a/src/common/Configuration.h
-+++ b/src/common/Configuration.h
-@@ -80,7 +80,7 @@ namespace SDDM {
-         );
-
-         Section(Users,
--            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/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("Comma-separated list of users that should not be listed"));
diff --git a/debian/patches/series b/debian/patches/series
index fbaee48..29b0efc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_sddm_systemctl.diff
 02_use_debian_theme.diff
 03_vt7-minimum-vt.diff
-04_set_default_path.diff
 05_add_debian_themes.diff
 handle-reading-from-a-closed-file-handle.patch

-- 
sddm packaging