[SCM] plasma-workspace packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-87-g9a568f4

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit dc1b73ac783a0aedc26e71672f3e9df07cc6ffbe
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sat Jan 16 13:26:36 2016 +0100

    Remove upstream applied patch part again
---
 debian/patches/kubuntu_startkde-qtpath.diff | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index 24856a1..1c6d2d5 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -46,16 +46,3 @@ Index: plasma-workspace/startkde/startkde.cmake
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-Index: plasma-workspace/startkde/CMakeLists.txt
-===================================================================
---- plasma-workspace.orig/startkde/CMakeLists.txt	2015-09-04 09:36:58.624473064 +0200
-+++ plasma-workspace/startkde/CMakeLists.txt	2015-09-04 09:36:58.620473223 +0200
-@@ -7,6 +7,8 @@
-     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)
- configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor  @ONLY)
- configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma  @ONLY)

-- 
plasma-workspace packaging