[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-13-gfb75f7e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3858f0158f46789ef94ccdf02f45812ebf01e512
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 2 22:58:56 2016 +0200

    Refresh patches
---
 debian/changelog                          |  1 +
 debian/patches/01_sddm_systemctl.diff     |  2 +-
 debian/patches/02_kubuntu_use_breeze.diff | 14 +++++++-------
 debian/patches/03_vt7-minimum-vt.diff     |  2 +-
 debian/patches/04_set_default_path.diff   | 12 ++++++------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a3f395..5fa278b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sddm (0.14.0-1~) UNRELEASED; urgency=medium
 
   * Add missing xserver dependencies. (Closes: 833080)
   * New upstream release (0.14.0).
+  * Refresh patches
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 02 Sep 2016 22:43:03 +0200
 
diff --git a/debian/patches/01_sddm_systemctl.diff b/debian/patches/01_sddm_systemctl.diff
index 592f540..c0aae76 100644
--- a/debian/patches/01_sddm_systemctl.diff
+++ b/debian/patches/01_sddm_systemctl.diff
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -137,8 +137,8 @@
+@@ -139,8 +139,8 @@
      endif()
  
      set(MINIMUM_VT 1)
diff --git a/debian/patches/02_kubuntu_use_breeze.diff b/debian/patches/02_kubuntu_use_breeze.diff
index 7b4b888..b84b336 100644
--- a/debian/patches/02_kubuntu_use_breeze.diff
+++ b/debian/patches/02_kubuntu_use_breeze.diff
@@ -1,11 +1,11 @@
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
-@@ -45,7 +45,7 @@
-         //      Name   Entries (but it's a regular class again)
+@@ -46,7 +46,7 @@
+         //  Name   Entries (but it's a regular class again)
          Section(Theme,
              Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
--            Entry(Current,             QString,     _S("maui"),                                 _S("Current theme name"));
-+            Entry(Current,             QString,     _S("breeze"),                                 _S("Current theme name"));
-             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Face icon directory
"
-                                                                                                    "The files should be in username.face.icon format"));
-             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
++            Entry(Current,             QString,     _S("breeze"),                               _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars
"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
diff --git a/debian/patches/03_vt7-minimum-vt.diff b/debian/patches/03_vt7-minimum-vt.diff
index 317e783..13e8e94 100644
--- a/debian/patches/03_vt7-minimum-vt.diff
+++ b/debian/patches/03_vt7-minimum-vt.diff
@@ -5,7 +5,7 @@ Last-Update: 2015-03-11
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
          string(REGEX REPLACE "[ 	
]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
      endif()
  
diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
index f82f286..a4ebaaf 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 @@
+@@ -145,7 +145,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"));
+@@ -78,7 +78,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