[SCM] plasma-workspace packaging branch, master, updated. debian/5.6.5.1-1-30-g74c8e19

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e06d9021f40efb72ca51e496a5d19f6d3a94d841
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Tue Jul 5 15:07:49 2016 +0200

    Refresh patches
---
 debian/patches/install_missing_header       | 25 -------------------------
 debian/patches/kubuntu_startkde-qtpath.diff |  4 ++--
 debian/patches/series                       |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
deleted file mode 100644
index ab9e09d..0000000
--- a/debian/patches/install_missing_header
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 6 Apr 2016 23:07:54 +0200
-Subject: install_missing_header
-
-===================================================================
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 174301f..b37b2d1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,7 +103,10 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
- configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
- configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
--
-+install(FILES
-+        ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel
-+)
- configure_file(plasma.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop)
- install(FILES
-         ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index 83b57ac..0446dcd 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -22,7 +22,7 @@ index 8513af1..957c131 100644
  configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor  @ONLY)
  configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma  @ONLY)
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 76221e5..baf0e45 100644
+index b320234..3508d86 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -3,6 +3,8 @@
@@ -43,7 +43,7 @@ index 76221e5..baf0e45 100644
    qdbus=$qbindir/qdbus
    case $PATH in
      $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-@@ -202,7 +204,7 @@ fi
+@@ -206,7 +208,7 @@ fi
  # better use the Autostart folder.
  
  # TODO: Use GenericConfigLocation once we depend on Qt 5.4
diff --git a/debian/patches/series b/debian/patches/series
index fed1404..4cea9b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 kubuntu_startkde-qtpath.diff
-install_missing_header
 disable_incompatible_tests

-- 
plasma-workspace packaging