[SCM] plasma-workspace packaging branch, master, updated. 931e7b5153cdc14924b82999d92627435ba85879

Maximiliano Curia maxy at moszumanska.debian.org
Sat Mar 21 18:50:09 UTC 2015


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

The following commit has been merged in the master branch:
commit 647c8c10ab6981660fa9d312610099bba7cb2155
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 20:32:31 2015 +0100

    New patch: install_missing_header.
---
 debian/changelog                            |  1 +
 debian/patches/install_missing_header       | 16 ++++++++++++++++
 debian/patches/kubuntu_startkde-qtpath.diff | 20 ++++++++++----------
 debian/patches/series                       |  1 +
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d39e2e..b100a83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ plasma-workspace (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Update copyright information.
   * Update install files.
   * Add basic autopkgtests support.
+  * New patch: install_missing_header.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 09 Feb 2015 14:31:36 +0100
 
diff --git a/debian/patches/install_missing_header b/debian/patches/install_missing_header
new file mode 100644
index 0000000..9565a73
--- /dev/null
+++ b/debian/patches/install_missing_header
@@ -0,0 +1,16 @@
+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 @@
+ 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)
+-
++install(FILES
++        ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h
++        DESTINATION ${INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel
++)
+ configure_file(plasma.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop)
+ install(FILES
+         ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop
diff --git a/debian/patches/kubuntu_startkde-qtpath.diff b/debian/patches/kubuntu_startkde-qtpath.diff
index 92e580c..916fe1d 100644
--- a/debian/patches/kubuntu_startkde-qtpath.diff
+++ b/debian/patches/kubuntu_startkde-qtpath.diff
@@ -2,10 +2,10 @@ Description: set path to qtpath
 Forwarded: not-needed
 Origin: vendor
 Author: Jonathan Riddell <jriddell at ubuntu.com>
-Index: plasma-workspace-5.1.2/startkde/startkde.cmake
+Index: plasma-workspace/startkde/startkde.cmake
 ===================================================================
---- plasma-workspace-5.1.2.orig/startkde/startkde.cmake
-+++ plasma-workspace-5.1.2/startkde/startkde.cmake
+--- plasma-workspace.orig/startkde/startkde.cmake	2015-02-10 20:31:42.588843281 +0100
++++ plasma-workspace/startkde/startkde.cmake	2015-02-10 20:31:42.588843281 +0100
 @@ -3,6 +3,8 @@
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
@@ -15,7 +15,7 @@ Index: plasma-workspace-5.1.2/startkde/startkde.cmake
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -19,7 +21,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+@@ -19,7 +21,7 @@
  # 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 +24,7 @@ Index: plasma-workspace-5.1.2/startkde/startkde.cmake
    qdbus=$qbindir/qdbus
    case $PATH in
      $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-@@ -203,7 +205,7 @@ fi
+@@ -201,7 +203,7 @@
  # better use the Autostart folder.
  
  # TODO: Use GenericConfigLocation once we depend on Qt 5.4
@@ -33,7 +33,7 @@ Index: plasma-workspace-5.1.2/startkde/startkde.cmake
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-@@ -213,7 +215,7 @@ for prefix in `echo $scriptpath`; do
+@@ -211,7 +213,7 @@
  done
  
  # Set the path for Qt plugins provided by KDE
@@ -42,11 +42,11 @@ Index: plasma-workspace-5.1.2/startkde/startkde.cmake
  # TODO: Do we really need this?
  QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
  export QT_PLUGIN_PATH
-Index: plasma-workspace-5.1.2/startkde/CMakeLists.txt
+Index: plasma-workspace/startkde/CMakeLists.txt
 ===================================================================
---- plasma-workspace-5.1.2.orig/startkde/CMakeLists.txt
-+++ plasma-workspace-5.1.2/startkde/CMakeLists.txt
-@@ -7,6 +7,8 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/u
+--- plasma-workspace.orig/startkde/CMakeLists.txt	2015-02-10 20:31:42.588843281 +0100
++++ plasma-workspace/startkde/CMakeLists.txt	2015-02-10 20:31:42.588843281 +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()
  
diff --git a/debian/patches/series b/debian/patches/series
index 59f4624..478d34f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_startkde-qtpath.diff
 upstream_gdb-7.8-fix.diff
+install_missing_header

-- 
plasma-workspace packaging



More information about the pkg-kde-commits mailing list