[SCM] plasma-workspace packaging branch, kubuntu_vivid_archive, updated. 1df011f50a7266478f72fcfd6672d2202eb0051d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1df011f50a7266478f72fcfd6672d2202eb0051d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 19 13:18:58 2014 +0100

    Remove kubuntu_add-qml2-path.diff causing issues for people developing Qt with self compiled or downloaded Qt import path compiled into Qt5Core's QLibraryInfo should be correct
---
 debian/changelog                          |  8 ++++++++
 debian/patches/kubuntu_add-qml2-path.diff | 34 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4786a51..c87b761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plasma-workspace (4:5.1.2-0ubuntu2) vivid; urgency=medium
+
+  * Remove kubuntu_add-qml2-path.diff causing issues for people
+    developing Qt with self compiled or downloaded Qt import path
+    compiled into Qt5Core's QLibraryInfo should be correct
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 19 Dec 2014 13:17:31 +0100
+
 plasma-workspace (4:5.1.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_add-qml2-path.diff b/debian/patches/kubuntu_add-qml2-path.diff
deleted file mode 100644
index 546b485..0000000
--- a/debian/patches/kubuntu_add-qml2-path.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: set path to QML
-Forwarded: not-needed
-Origin: vendor
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-Index: b/startkde/startkde.cmake
-===================================================================
---- b.orig/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -3,6 +3,8 @@
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
- 
-+export QML2_IMPORT_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/qml/
-+
- if test "x$1" = x--failsafe; then
-     KDE_FAILSAFE=1 # General failsafe flag
-     KWIN_COMPOSE=N # Disable KWin's compositing
-Index: b/startkde/CMakeLists.txt
-===================================================================
---- b.orig/startkde/CMakeLists.txt
-+++ b/startkde/CMakeLists.txt
-@@ -7,8 +7,10 @@ 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)
-   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/debian/patches/series b/debian/patches/series
index 1783faa..59f4624 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-kubuntu_add-qml2-path.diff
 kubuntu_startkde-qtpath.diff
 upstream_gdb-7.8-fix.diff

-- 
plasma-workspace packaging