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

[Pino Toscano]

The following commit has been merged in the master branch:
commit d01a5c2617d234d4b2bf70bfdbd214adf4d80a19
Author: Pino Toscano <pino at kde.org>
Date:   Tue Mar 1 22:41:26 2011 +0100

    drop patch 28_find_old_kde4_html_documentation.diff
---
 debian/changelog                                   |    2 +
 .../28_find_old_kde4_html_documentation.diff       |   25 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ed3194..bbd2fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ kde4libs (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Improve Depends and Recommends of libsolid:
     - Linux archs: depend on udev, and recommend udisks and upower
     - non-Linux archs: depend on hal
+  * Drop patch 28_find_old_kde4_html_documentation.diff, which was temporary
+    for migration to Squeeze.
 
   [ José Manuel Santamaría Lema ]
   * Disable 23_solid_no_double_build.diff, produces FTBFS.
diff --git a/debian/patches/28_find_old_kde4_html_documentation.diff b/debian/patches/28_find_old_kde4_html_documentation.diff
deleted file mode 100644
index a408dad..0000000
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: find documentation of applications built against Debian KDE SC << 4.4.4
- Debian has switched HTML_INSTALL_DIR to /usr/share/doc/kde with the release of
- KDE SC 4.4.4 to Debian unstable. This patch allows khelpcenter4 to open
- documentation of KDE applications that were built with prior versions of KDE 4
- Develop Plarform.
-Author: Modestas Vainius <modax at debian.org>
-Author: Xavier Vello <xavier.vello at gmail.com>
-Forwarded: not-needed
-Origin: vendor
-Last-Update: 2010-05-28
-
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1883,6 +1883,11 @@
- 
-     addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
-     addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority
-+
-+    // Debian patch: add old KDE4 HTML documentation dir, so that
-+    // khelpcenter4 can open documentation of KDE applications built against
-+    // Debian KDE SC << 4.4.4.
-+    addResourceDir("html", QLatin1String("/usr/share/doc/kde4/HTML"), false);
- }
- 
- static QStringList lookupProfiles(const QString &mapFile)
diff --git a/debian/patches/series b/debian/patches/series
index ce1f448..c7f3c14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 25_ld_exclude_libs_qtuitools.diff
 27_konsole_kfreebsd_fix.diff
-28_find_old_kde4_html_documentation.diff
 29_hurd_support.diff
 30_kfileshare_kdesu_fileshareset.diff
 31_relax_plugin_kde_version_check.diff

-- 
KDE Development Platform Libraries module packaging