[SCM] plasma-workspace packaging branch, master, updated. debian/5.8.6-2.1-9-g23a6464

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=1754198

The following commit has been merged in the master branch:
commit 175419853883d0320eaf0abead2d1b74261bffe9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 16 15:15:31 2017 +0200

    Refresh patches
    
    Gbp-Dch: Ignore
---
 debian/patches/add_sddm_debian_breeze.patch | 39 ++++++++++++++++++++---------
 debian/patches/replace-fds.patch            | 20 ++++++++++-----
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/debian/patches/add_sddm_debian_breeze.patch b/debian/patches/add_sddm_debian_breeze.patch
index d7313a2..751d782 100644
--- a/debian/patches/add_sddm_debian_breeze.patch
+++ b/debian/patches/add_sddm_debian_breeze.patch
@@ -1,8 +1,21 @@
-Index: plasma-workspace/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Fri, 16 Jun 2017 15:09:35 +0200
+Subject: add_sddm_debian_breeze
+
 ===================================================================
---- plasma-workspace.orig/CMakeLists.txt	2016-12-01 00:31:20.000000000 +0100
-+++ plasma-workspace/CMakeLists.txt	2016-12-01 00:42:40.883970067 +0100
-@@ -122,6 +122,17 @@
+---
+ CMakeLists.txt                     | 11 +++++++++++
+ sddm-theme-debian/metadata.desktop | 17 +++++++++++++++++
+ sddm-theme-debian/theme.conf       |  2 ++
+ 3 files changed, 30 insertions(+)
+ create mode 100644 sddm-theme-debian/metadata.desktop
+ create mode 100644 sddm-theme-debian/theme.conf
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index caec7bd..e7a310c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,6 +122,17 @@ if (INSTALL_SDDM_THEME)
      #NOTE this trailing slash is important to rename the directory
      install(DIRECTORY sddm-theme/ DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE PATTERN "components" EXCLUDE PATTERN "dummydata" EXCLUDE)
      install(DIRECTORY lookandfeel/contents/components DESTINATION ${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze PATTERN "README.txt" EXCLUDE)
@@ -20,10 +33,11 @@ Index: plasma-workspace/CMakeLists.txt
  endif()
  
  add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-Index: plasma-workspace/sddm-theme-debian/metadata.desktop
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ plasma-workspace/sddm-theme-debian/metadata.desktop	2016-12-01 00:31:24.000000000 +0100
+diff --git a/sddm-theme-debian/metadata.desktop b/sddm-theme-debian/metadata.desktop
+new file mode 100644
+index 0000000..e54529c
+--- /dev/null
++++ b/sddm-theme-debian/metadata.desktop
 @@ -0,0 +1,17 @@
 +[SddmGreeterTheme]
 +Name=Debian Breeze
@@ -42,10 +56,11 @@ Index: plasma-workspace/sddm-theme-debian/metadata.desktop
 +Email=davidedmundson at kde.org
 +Theme-Id=debian-breeze
 +Theme-API=2.0
-Index: plasma-workspace/sddm-theme-debian/theme.conf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ plasma-workspace/sddm-theme-debian/theme.conf	2016-12-01 00:31:24.000000000 +0100
+diff --git a/sddm-theme-debian/theme.conf b/sddm-theme-debian/theme.conf
+new file mode 100644
+index 0000000..c4bf093
+--- /dev/null
++++ b/sddm-theme-debian/theme.conf
 @@ -0,0 +1,2 @@
 +[General]
 +background=/usr/share/desktop-base/active-theme/login/background.svg
diff --git a/debian/patches/replace-fds.patch b/debian/patches/replace-fds.patch
index ab52832..19c03a3 100644
--- a/debian/patches/replace-fds.patch
+++ b/debian/patches/replace-fds.patch
@@ -1,7 +1,10 @@
-Description: Not close stdin,stdout,stderr, and redirects stdin,stdout,stderr to /dev/null
- This fix a bug in ksplashqml. An upstream commit
- https://cgit.kde.org/plasma-workspace.git/commit/?id=56d2c15b9acb9c4b57398b281685807c3191f622
- has caused this problem.
+From: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
+Date: Fri, 16 Jun 2017 15:09:35 +0200
+Subject: Not close stdin,stdout,stderr, and redirects stdin,stdout,stderr
+
+This fix a bug in ksplashqml. An upstream commit
+https://cgit.kde.org/plasma-workspace.git/commit/?id=56d2c15b9acb9c4b57398b281685807c3191f622
+has caused this problem.
 
  x-session-manag,133,kdetest /usr/bin/x-session-manager
    +-(ksplashqml,232)
@@ -76,9 +79,14 @@ Forwarded: https://bugs.kde.org/show_bug.cgi?id=380495
 Bug-Debian: https://bugs.debian.org/862558
 Author: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
 Last-Update: 2017-06-02
+---
+ ksplash/ksplashqml/main.cpp | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
 
---- plasma-workspace-5.8.6.orig/ksplash/ksplashqml/main.cpp
-+++ plasma-workspace-5.8.6/ksplash/ksplashqml/main.cpp
+diff --git a/ksplash/ksplashqml/main.cpp b/ksplash/ksplashqml/main.cpp
+index 25faacd..03c9e08 100644
+--- a/ksplash/ksplashqml/main.cpp
++++ b/ksplash/ksplashqml/main.cpp
 @@ -24,6 +24,9 @@
  #include <QTextStream>
  

-- 
plasma-workspace packaging