[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.4-3-6-gfdb2707

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit fdb2707c0ff5cf5f4dca133c64aa2e214b99f4cd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 21 14:23:12 2012 -0300

    Refreshed patch add_dlrestrictions_support.diff
---
 debian/changelog                               |    4 +++-
 debian/patches/add_dlrestrictions_support.diff |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec4bf6a..77456ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ kde4libs (4:4.8.5-1) UNRELEASED; urgency=low
     - 02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
     - 03_upstream_powermanager_fix_05f1a19291af5c16745b76c3e0944c5b80ef5870.diff
     which were taken from upstream.
-  * Refresh patch make_libkdeinit4_private.diff.
+  * Refresh patches:
+    - make_libkdeinit4_private.diff.
+    - add_dlrestrictions_support.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Sep 2012 14:02:51 -0300
 
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 68c9686..094ecb2 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -22,7 +22,7 @@ on all (or some) the targets.
 
 --- a/cmake/modules/KDE4Macros.cmake
 +++ b/cmake/modules/KDE4Macros.cmake
-@@ -1026,10 +1026,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
+@@ -1035,10 +1035,14 @@
     if (${_lib_TYPE} STREQUAL "SHARED")
        set(_first_SRC)
        set(_add_lib_param SHARED)
@@ -37,7 +37,7 @@ on all (or some) the targets.
     endif (${_lib_TYPE} STREQUAL "MODULE")
  
     set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1317,6 +1321,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
+@@ -1326,6 +1330,13 @@
  
  endfunction(KDE4_INSTALL_AUTH_ACTIONS)
  
@@ -53,7 +53,7 @@ on all (or some) the targets.
     message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro and has been removed again. Just remove the code which calls it, there is no substitute.")
 --- a/kdecore/CMakeLists.txt
 +++ b/kdecore/CMakeLists.txt
-@@ -399,6 +399,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
+@@ -406,6 +406,14 @@
  
  target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
  
@@ -85,7 +85,7 @@ on all (or some) the targets.
  extern int kLibraryDebugArea();
  
  class KPluginLoaderPrivate
-@@ -259,6 +267,30 @@ bool KPluginLoader::load()
+@@ -259,6 +267,30 @@
      else
          d->pluginVersion = ~0U;
  

-- 
KDE Development Platform Libraries module packaging