[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-119-g8489bf3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit b531b67945b0d7dba6389661915bcf3c54893749
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 15:02:02 2011 +0300

    Set ENABLE_LIBKDEINIT_RUNPATH to ON if build type is Debian
    
    This will allow to remove ENABLE_LIBKDEINIT_RUNPATH=ON from kde4_flags in
    pkg-kde-tools. The change was made implemented in make_libkdeinit4_private.diff
    patch.
---
 debian/changelog                             |    2 ++
 debian/patches/make_libkdeinit4_private.diff |   23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16d42cf..98c7b99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ kde4libs (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Remove sequence numbers from debian/patches.
   * Drop kaboom support, no longer needed.
   * Remove ~/.kde4 -> ~/.kde transition templates, no longer needed.
+  * Set ENABLE_LIBKDEINIT_RUNPATH to ON if build type is Debian
+    (patch make_libkdeinit4_private.diff altered).
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 23b2067..7acba2c 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax at debian.org>
 Subject: Framework for making libkdeinit4_*.so "private"
 Forwarded: no
 Origin: vendor
-Last-Update: 2010-06-07
+Last-Update: 2011-03-27
 
 The patch adds LIBKDEINIT_INSTALL_DIR cmake flag which specifies where
 libkdeinit4_*.so are supposed to end up. Please note, however, that
@@ -11,11 +11,11 @@ libkdeinit4_*.so will not be automatically installed to LIBKDEINIT_INSTALL_DIR
 to LIBKDEINIT_INSTALL_DIR manually in packaging (or e.g. with
 dh_movelibkdeinit).
 
-Therefore, RUNPATH is disabled by default due to above limitation. Each
-application will have to set ENABLE_LIBKDEINIT_RUNPATH:BOOL=ON cmake flag in
-order for proper RUNPATH to be set on the generated kdeinit executables. However,
-CDBS kde.mk and debhelper kde addon/buildsystem enable this flag by default and
-hence call dh_movelibkdeinit.
+ENABLE_LIBKDEINIT_RUNPATH boolean variable controls whether to add RUNPATH to
+generated kdeinit executables. ENABLE_LIBKDEINIT_RUNPATH is OFF by default
+unless CMAKE_BUILD_TYPE is set to Debian. However, please note that CDBS kde.mk
+and debhelper kde addon/buildsystem set CMAKE_BUILD_TYPE=Debian and call
+dh_movelibkdeinit by default.
 
 The patch also adds support for "kdeinit" resource type to KDE Platform
 libraries.
@@ -47,6 +47,17 @@ libraries.
     _set_fancy(IMPORTS_INSTALL_DIR       "${PLUGIN_INSTALL_DIR}/imports"                "The subdirectory relative to the install prefix where imports will be installed")
     _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
     _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
+@@ -1334,6 +1335,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+ 
+ endif (CMAKE_C_COMPILER MATCHES "icc")
+ 
++if (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE STREQUAL "Debian")
++   set(ENABLE_LIBKDEINIT_RUNPATH ON CACHE BOOL
++       "Add R(UN)PATH to kdeinit-based shared executables (defaults to ON if build type is Debian)")
++endif (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE STREQUAL "Debian")
+ 
+ ###########    end of platform specific stuff  ##########################
+ 
 --- a/cmake/modules/KDE4Macros.cmake
 +++ b/cmake/modules/KDE4Macros.cmake
 @@ -810,6 +810,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ

-- 
KDE Development Platform Libraries module packaging