[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2-55-g2c715d5

[Didier Raboud]

The following commit has been merged in the master branch:
commit 1b320cfd58b6504b1816a247fb48b8f775e55363
Author: Didier Raboud <didier at raboud.com>
Date:   Wed Dec 8 11:35:34 2010 +0100

    Refresh patches for 4.5.85
---
 debian/changelog                                   |    2 +-
 debian/patches/08_add_debian_build_type.diff       |    2 +-
 .../patches/11_default_kde4_xdg_menu_prefix.diff   |    4 ++--
 .../22_hack_in_etc_kde4_in_kstandarddirs.diff      |    2 +-
 debian/patches/23_solid_no_double_build.diff       |    2 +-
 .../28_find_old_kde4_html_documentation.diff       |    2 +-
 .../patches/31_relax_plugin_kde_version_check.diff |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3dce4b..51c2e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,7 @@ kde4libs (4:4.5.85-0r1) UNRELEASED; urgency=low
   * Bump kdebase-runtime Breaks/Recommends to version 4.5.
 
   [ Didier Raboud ]
-  * Refresh patches for 4.5.80.
+  * Refresh patches for 4.5.85.
   * Adjust build-dependencies:
     - Bump required:
       - Qt to 4:4.7.0~rc1.
diff --git a/debian/patches/08_add_debian_build_type.diff b/debian/patches/08_add_debian_build_type.diff
index cda798d..4030bbf 100644
--- a/debian/patches/08_add_debian_build_type.diff
+++ b/debian/patches/08_add_debian_build_type.diff
@@ -9,7 +9,7 @@ icons.
 
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1196,11 +1196,13 @@
+@@ -1198,11 +1198,13 @@
     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
diff --git a/debian/patches/11_default_kde4_xdg_menu_prefix.diff b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
index 4c09ac4..d264d98 100644
--- a/debian/patches/11_default_kde4_xdg_menu_prefix.diff
+++ b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
@@ -16,7 +16,7 @@
  install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
-@@ -768,8 +768,10 @@
+@@ -770,8 +770,10 @@
     QString result;
  
     QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -29,7 +29,7 @@
        QFileInfo fileInfo(fileName);
  
        QString fileNameOnly = fileInfo.fileName();
-@@ -779,7 +781,6 @@
+@@ -781,7 +783,6 @@
        QString baseName = QDir::cleanPath(m_docInfo.baseDir +
                                           fileInfo.path() + '/' + fileNameOnly);
        result = KStandardDirs::locate("xdgconf-menu", baseName);
diff --git a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
index 624dc3b..0bec82b 100644
--- a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
@@ -12,7 +12,7 @@ overridden by adding new files to /etc/kde4 by the sysadm.
 
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1147,6 +1147,10 @@
+@@ -1174,6 +1174,10 @@
                          if ((local || testdir.exists()) && !candidates.contains(path))
                              candidates.append(path);
                      }
diff --git a/debian/patches/23_solid_no_double_build.diff b/debian/patches/23_solid_no_double_build.diff
index fddcfcd..96fe30f 100644
--- a/debian/patches/23_solid_no_double_build.diff
+++ b/debian/patches/23_solid_no_double_build.diff
@@ -4,7 +4,7 @@
 
 --- a/solid/solid/CMakeLists.txt
 +++ b/solid/solid/CMakeLists.txt
-@@ -362,7 +362,14 @@
+@@ -366,7 +366,14 @@
  install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
  
  ########### static lib for tests  ###############
diff --git a/debian/patches/28_find_old_kde4_html_documentation.diff b/debian/patches/28_find_old_kde4_html_documentation.diff
index cadc7d3..60331ea 100644
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ b/debian/patches/28_find_old_kde4_html_documentation.diff
@@ -11,7 +11,7 @@ Last-Update: 2010-05-28
 
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1856,6 +1856,11 @@
+@@ -1883,6 +1883,11 @@
  
      addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
      addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority
diff --git a/debian/patches/31_relax_plugin_kde_version_check.diff b/debian/patches/31_relax_plugin_kde_version_check.diff
index ac57543..be082e5 100644
--- a/debian/patches/31_relax_plugin_kde_version_check.diff
+++ b/debian/patches/31_relax_plugin_kde_version_check.diff
@@ -18,7 +18,7 @@ Last-Update: 2010-06-22
 
 --- a/kdecore/util/kpluginloader.cpp
 +++ b/kdecore/util/kpluginloader.cpp
-@@ -244,7 +244,6 @@
+@@ -243,7 +243,6 @@
      d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
      if (d->verificationData) {
          if (d->verificationData->dataVersion < KDEPluginVerificationData::PluginVerificationDataVersion

-- 
KDE Development Platform Libraries module packaging