[SCM] plasma-workspace packaging branch, kubuntu_unstable, updated. ubuntu/4%5.3.2-0ubuntu1-8-gb80fd1b

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b80fd1b167f94161f231dc852d86a3bd7846e314
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jul 17 08:19:31 2015 +0200

    refresh to get rid of fuzzyness
---
 debian/patches/install_missing_header       |  6 +++---
 debian/patches/kubuntu_startkde-qtpath.diff | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index 9565a73..a319f6c 100644
--- a/debian/patches/install_missing_header
+++ b/debian/patches/install_missing_header
@@ -1,8 +1,8 @@
 Index: plasma-workspace/CMakeLists.txt
 ===================================================================
---- plasma-workspace.orig/CMakeLists.txt	2015-02-10 20:28:49.183793069 +0100
-+++ plasma-workspace/CMakeLists.txt	2015-02-10 20:29:26.634292187 +0100
-@@ -101,7 +101,10 @@
+--- plasma-workspace.orig/CMakeLists.txt
++++ plasma-workspace/CMakeLists.txt
+@@ -102,7 +102,10 @@ include_directories("${CMAKE_CURRENT_BIN
  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)
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index e9d1f82..26230fd 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -2,25 +2,23 @@ Description: set path to qtpath
 Forwarded: not-needed
 Origin: vendor
 Author: Jonathan Riddell <jriddell at ubuntu.com>
-Index: plasma-workspace/startkde/startkde.cmake
+Index: plasma-workspace/startkde/CMakeLists.txt
 ===================================================================
-diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
-index 6cc1fa3..8beb59c 100644
---- a/startkde/CMakeLists.txt
-+++ b/startkde/CMakeLists.txt
-@@ -7,6 +7,8 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+--- plasma-workspace.orig/startkde/CMakeLists.txt
++++ plasma-workspace/startkde/CMakeLists.txt
+@@ -7,6 +7,8 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/u
      set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
  endif()
  
 +execute_process( COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE DEB_HOST_MULTIARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 +
  configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
- 
- if(NOT WIN32)
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 2585600..36930fd 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
+ configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor  @ONLY)
+ configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma  @ONLY)
+Index: plasma-workspace/startkde/startkde.cmake
+===================================================================
+--- plasma-workspace.orig/startkde/startkde.cmake
++++ plasma-workspace/startkde/startkde.cmake
 @@ -3,6 +3,8 @@
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #

-- 
plasma-workspace packaging