[SCM] KDE Development Platform Libraries module packaging branch, kde4.9, updated. debian/4.8.4-3-30-gf7ff1de

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=49369fb

The following commit has been merged in the kde4.9 branch:
commit 49369fb3c71ac4df57a12d1112cac70c70c84ee7
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jan 10 00:17:40 2013 +0100

    Update make_libkdeinit4_private.diff.
---
 debian/changelog                             |    1 +
 debian/patches/make_libkdeinit4_private.diff |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e9cd7b..2fe9e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kde4libs (4:4.9.5-0r0) UNRELEASED; urgency=low
   * Update patches:
     - drop fix-copying-of-files-with-extended-ACLs.patch, applied upstream.
     - drop python3-support-bytecode.patch, applied upstream.
+    - update make_libkdeinit4_private.diff.
     - refresh other patches to make them apply without any offset.
   * Bump libsoprano-dev build dependency to >= 2.7.56.
   * Add aspell to build dependencies, this is a workaround for a possible bug in
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index d9f0615..a63d6ad 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -60,10 +60,10 @@ libraries.
  
 --- a/cmake/modules/KDE4Macros.cmake
 +++ b/cmake/modules/KDE4Macros.cmake
-@@ -819,6 +819,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
-       set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
- 
-       kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
+@@ -825,6 +825,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
+ 	      endif(NOT _res_position EQUAL -1)
+       endif (Q_WS_MAC)
+       kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
 +      if (UNIX AND ENABLE_LIBKDEINIT_RUNPATH)
 +         list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIBKDEINIT_INSTALL_DIR}" _isSystemKdeinitDir)
 +         if("${_isSystemKdeinitDir}" STREQUAL "-1")

-- 
KDE Development Platform Libraries module packaging