[SCM] plasma-workspace packaging branch, master, updated. debian/5.8.7-1-46-g96dca25

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 96dca252852ad3585a9e96d6a0173fbeb79e3ef9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 17 14:36:19 2017 +0300

    Drop kubuntu_startkde-qtpath.diff.
    
    It is not needed with qtchooser 52-gae5eeef and newer, which has fallback
    support for qtpaths.
---
 debian/changelog                            |  3 ++
 debian/patches/kubuntu_startkde-qtpath.diff | 45 -----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b164907..26b0585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 plasma-workspace (4:5.10.5-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Drop kubuntu_startkde-qtpath.diff, not needed with qtchooser 52-gae5eeef
+    and newer which has fallback support for qtpaths.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Oct 2017 14:27:49 +0300
 
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
deleted file mode 100644
index 609c97e..0000000
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ /dev/null
@@ -1,45 +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: kubuntu_startkde-qtpath
-
-===================================================================
----
- startkde/CMakeLists.txt | 2 ++
- startkde/startkde.cmake | 4 +++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
-index fe29f57..2cb1102 100644
---- a/startkde/CMakeLists.txt
-+++ b/startkde/CMakeLists.txt
-@@ -8,6 +8,8 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-     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)
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 2f67bdc..ea47fb3 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -3,6 +3,8 @@
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
- 
-+QTPATHS=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/bin/qtpaths
-+
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
-@@ -154,7 +156,7 @@ fi
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '
'`
-+scriptpath=`${QTPATHS} --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '
'`
- 
- # Add /env/ to the directory to locate the scripts to be sourced
- for prefix in `echo $scriptpath`; do
diff --git a/debian/patches/series b/debian/patches/series
index 08082f1..a16c5b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-kubuntu_startkde-qtpath.diff
 disable_incompatible_tests
 add_sddm_debian_breeze.patch
 replace-fds.patch

-- 
plasma-workspace packaging