[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-18-g4b46079

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 435947e813dc46e18cb549af4ecf4b7584e8827b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Nov 11 09:47:07 2016 +0100

    Refresh patches to gbp-pq format
    
    Gbp-Dch: Ignore
---
 debian/patches/01_sddm_systemctl.diff     | 12 +++++++++++-
 debian/patches/02_kubuntu_use_breeze.diff | 12 +++++++++++-
 debian/patches/03_vt7-minimum-vt.diff     | 15 +++++++++++----
 debian/patches/04_set_default_path.diff   | 32 ++++++++++++++++++++-----------
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/debian/patches/01_sddm_systemctl.diff b/debian/patches/01_sddm_systemctl.diff
index c0aae76..cc629a1 100644
--- a/debian/patches/01_sddm_systemctl.diff
+++ b/debian/patches/01_sddm_systemctl.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Fri, 11 Nov 2016 09:45:34 +0100
+Subject: _sddm_systemctl
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe8074b..98551b3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -139,8 +139,8 @@
+@@ -139,8 +139,8 @@ if(SYSTEMD_FOUND)
      endif()
  
      set(MINIMUM_VT 1)
diff --git a/debian/patches/02_kubuntu_use_breeze.diff b/debian/patches/02_kubuntu_use_breeze.diff
index b84b336..52349eb 100644
--- a/debian/patches/02_kubuntu_use_breeze.diff
+++ b/debian/patches/02_kubuntu_use_breeze.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Fri, 11 Nov 2016 09:45:34 +0100
+Subject: _kubuntu_use_breeze
+
+---
+ src/common/Configuration.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index f790343..933931d 100644
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ namespace SDDM {
          //  Name   Entries (but it's a regular class again)
          Section(Theme,
              Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
diff --git a/debian/patches/03_vt7-minimum-vt.diff b/debian/patches/03_vt7-minimum-vt.diff
index 13e8e94..362e28e 100644
--- a/debian/patches/03_vt7-minimum-vt.diff
+++ b/debian/patches/03_vt7-minimum-vt.diff
@@ -1,11 +1,18 @@
-Description: Always minimum vt to 7
- maybe this will fix switching vt when installing packages and integration with ubiquity-dm?
-Author: Jonathan Riddell
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Fri, 11 Nov 2016 09:45:34 +0100
+Subject: Always minimum vt to 7
+
+maybe this will fix switching vt when installing packages and integration with ubiquity-dm?
 Last-Update: 2015-03-11
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98551b3..e4c05f6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ if(SYSTEMD_FOUND)
          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 a4ebaaf..48ee987 100644
--- a/debian/patches/04_set_default_path.diff
+++ b/debian/patches/04_set_default_path.diff
@@ -1,18 +1,26 @@
-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>
+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: 2015-09-14
 ---
+ data/man/sddm.conf.rst.in  | 2 +-
+ src/common/Configuration.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
+index 3238af5..f8bca5f 100644
 --- a/data/man/sddm.conf.rst.in
 +++ b/data/man/sddm.conf.rst.in
-@@ -145,7 +145,7 @@
+@@ -145,7 +145,7 @@ OPTIONS
  
  `DefaultPath=`
  	Default path to set after successfully logging in.
@@ -21,9 +29,11 @@ Last-Update: 2015-09-14
  
  `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 933931d..4d0a281 100644
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ namespace SDDM {
          );
  
          Section(Users,

-- 
sddm packaging