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

[Lisandro Damián Nicanor Pérez]

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

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

    Refreshed patch make_libkdeinit4_private.diff.
---
 debian/changelog                             |    1 +
 debian/patches/make_libkdeinit4_private.diff |   28 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fd0f6d..ec4bf6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ 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.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Sep 2012 14:02:51 -0300
 
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index c196dc0..7c5b6c8 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,7 +21,7 @@ The patch also adds support for "kdeinit" resource type to KDE Platform
 libraries.
 --- a/CreateKDELibsDependenciesFile.cmake
 +++ b/CreateKDELibsDependenciesFile.cmake
-@@ -32,6 +32,7 @@ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PR
+@@ -32,6 +32,7 @@
  make_install_path_absolute(KDE4_LIB_INSTALL_DIR     ${LIB_INSTALL_DIR})
  make_install_path_absolute(KDE4_IMPORTS_INSTALL_DIR     ${IMPORTS_INSTALL_DIR})
  make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
@@ -29,7 +29,7 @@ libraries.
  make_install_path_absolute(KDE4_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
  make_install_path_absolute(KDE4_BIN_INSTALL_DIR     ${BIN_INSTALL_DIR})
  make_install_path_absolute(KDE4_SBIN_INSTALL_DIR    ${SBIN_INSTALL_DIR})
-@@ -65,6 +66,7 @@ endif (NOT KDE4_INSTALL_DIR)
+@@ -65,6 +66,7 @@
  set(KDE4_LIB_INSTALL_DIR     \"${KDE4_LIB_INSTALL_DIR}\")
  set(KDE4_IMPORTS_INSTALL_DIR     \"${KDE4_IMPORTS_INSTALL_DIR}\")
  set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
@@ -39,7 +39,7 @@ libraries.
  set(KDE4_SBIN_INSTALL_DIR    \"${KDE4_SBIN_INSTALL_DIR}\")
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -871,6 +871,7 @@ else (WIN32)
+@@ -871,6 +871,7 @@
     _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
  
     _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
@@ -47,7 +47,7 @@ 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")
-@@ -1332,6 +1333,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1332,6 +1333,10 @@
  
  endif (CMAKE_C_COMPILER MATCHES "icc")
  
@@ -60,7 +60,7 @@ libraries.
  
 --- a/cmake/modules/KDE4Macros.cmake
 +++ b/cmake/modules/KDE4Macros.cmake
-@@ -810,6 +810,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
+@@ -819,6 +819,17 @@
        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)
@@ -80,7 +80,7 @@ libraries.
  
 --- a/kinit/CMakeLists.txt
 +++ b/kinit/CMakeLists.txt
-@@ -58,6 +58,17 @@ endif(Q_WS_X11)
+@@ -58,6 +58,17 @@
  
  install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
@@ -110,7 +110,7 @@ libraries.
  #define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
 --- a/kdecore/kde-config.cpp
 +++ b/kdecore/kde-config.cpp
-@@ -144,6 +144,7 @@ int main(int argc, char **argv)
+@@ -144,6 +144,7 @@
              "html", I18N_NOOP("HTML documentation"),
              "icon", I18N_NOOP("Icons"),
              "kcfg", I18N_NOOP("Configuration description files"),
@@ -120,7 +120,7 @@ libraries.
              "locale", I18N_NOOP("Translation files for KLocale"),
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -165,6 +165,8 @@ xdgconf-menu
+@@ -165,6 +165,8 @@
  menus
  xdgconf-autostart
  autostart
@@ -129,7 +129,7 @@ libraries.
  */
  
  static const char types_string[] =
-@@ -219,6 +221,8 @@ static const char types_string[] =
+@@ -219,6 +221,8 @@
      "menus

-- 
KDE Development Platform Libraries module packaging