[SCM] plasma-workspace packaging branch, master, updated. debian/5.4.3-2-35-g5e9265c

Maximiliano Curia maxy at moszumanska.debian.org
Tue Apr 12 16:47:41 UTC 2016 

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

The following commit has been merged in the master branch:
commit 214cbaf0700c0cf332e0f61fd743191174cf9422
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Apr 6 23:07:57 2016 +0200

    Refresh patches
---
 debian/patches/disable_incompatible_tests   | 15 +++++++--
 debian/patches/install_missing_header       | 17 +++++++---
 debian/patches/kubuntu_startkde-qtpath.diff | 50 ++++++++++++++++-------------
 3 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/debian/patches/disable_incompatible_tests b/debian/patches/disable_incompatible_tests
index 79cf0db..c5aebd5 100644
--- a/debian/patches/disable_incompatible_tests
+++ b/debian/patches/disable_incompatible_tests
@@ -1,7 +1,16 @@
-Index: plasma-workspace/kioslave/desktop/tests/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 6 Apr 2016 23:07:54 +0200
+Subject: disable_incompatible_tests
+
 ===================================================================
---- plasma-workspace.orig/kioslave/desktop/tests/CMakeLists.txt	2015-12-16 14:59:09.833538037 +0100
-+++ plasma-workspace/kioslave/desktop/tests/CMakeLists.txt	2015-12-16 14:59:09.833538037 +0100
+---
+ kioslave/desktop/tests/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kioslave/desktop/tests/CMakeLists.txt b/kioslave/desktop/tests/CMakeLists.txt
+index efad1fb..3b7ac0f 100644
+--- a/kioslave/desktop/tests/CMakeLists.txt
++++ b/kioslave/desktop/tests/CMakeLists.txt
 @@ -1,6 +1,6 @@
  add_executable(testdesktop kio_desktop_test.cpp)
  target_link_libraries(testdesktop KF5::KIOWidgets KF5::Solid Qt5::Test KF5::KDELibs4Support)
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
index 8a151d4..ad20028 100644
--- a/debian/patches/install_missing_header
+++ b/debian/patches/install_missing_header
@@ -1,8 +1,17 @@
-Index: plasma-workspace/CMakeLists.txt
+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
+
 ===================================================================
---- plasma-workspace.orig/CMakeLists.txt	2015-12-16 14:57:29.253739122 +0100
-+++ plasma-workspace/CMakeLists.txt	2015-12-16 14:57:29.249739289 +0100
-@@ -98,7 +98,10 @@
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b70a7d5..c8080d4 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)
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index 1fcdf1e..83b57ac 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -1,11 +1,30 @@
-Description: set path to qtpath
-Forwarded: not-needed
-Origin: vendor
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-Index: plasma-workspace/startkde/startkde.cmake
+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
+
 ===================================================================
---- plasma-workspace.orig/startkde/startkde.cmake	2015-12-16 14:57:10.226533877 +0100
-+++ plasma-workspace/startkde/startkde.cmake	2015-12-16 14:57:10.214534378 +0100
+---
+ startkde/CMakeLists.txt | 2 ++
+ startkde/startkde.cmake | 6 ++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
+index 8513af1..957c131 100644
+--- a/startkde/CMakeLists.txt
++++ b/startkde/CMakeLists.txt
+@@ -7,6 +7,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 76221e5..baf0e45 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
 @@ -3,6 +3,8 @@
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
@@ -15,7 +34,7 @@ Index: plasma-workspace/startkde/startkde.cmake
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -20,7 +22,7 @@
+@@ -20,7 +22,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
  # in case we have been started with full pathname spec without being in PATH
  bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,,p'`
  if [ -n "$bindir" ]; then
@@ -24,7 +43,7 @@ Index: plasma-workspace/startkde/startkde.cmake
    qdbus=$qbindir/qdbus
    case $PATH in
      $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-@@ -202,7 +204,7 @@
+@@ -202,7 +204,7 @@ fi
  # better use the Autostart folder.
  
  # TODO: Use GenericConfigLocation once we depend on Qt 5.4
@@ -33,16 +52,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-12-16 14:57:10.226533877 +0100
-+++ plasma-workspace/startkde/CMakeLists.txt	2015-12-16 14:57:10.222534044 +0100
-@@ -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

More information about the pkg-kde-commits mailing list