rev 18098 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-28 20:27:47 +0000 (Fri, 28 May 2010)
New Revision: 18098

Added:
   trunk/packages/kdelibs/debian/patches/28_find_old_kde4_html_documentation.diff
Removed:
   trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
Rename 28_find_kde3_html_documentation.diff to
28_find_old_kde4_html_documentation.diff and modify it to look in the
/usr/share/doc/kde4/HTML (old HTML_INSTALL_DIR default).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-05-28 20:08:17 UTC (rev 18097)
+++ trunk/packages/kdelibs/debian/changelog	2010-05-28 20:27:47 UTC (rev 18098)
@@ -12,6 +12,9 @@
   * Add debian/NEWS about HTML_INSTALL_DIR switch and pkg-kde-tools drop from
     kdelibs5-dev Depends.
   * Replace usr/share/doc/kde4 references with usr/share/doc/kde.
+  * Rename 28_find_kde3_html_documentation.diff to
+    28_find_old_kde4_html_documentation.diff and modify it to look in the
+    /usr/share/doc/kde4/HTML (old HTML_INSTALL_DIR default).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 May 2010 21:51:12 +0300
 

Copied: trunk/packages/kdelibs/debian/patches/28_find_old_kde4_html_documentation.diff (from rev 18097, trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff)
===================================================================
--- trunk/packages/kdelibs/debian/patches/28_find_old_kde4_html_documentation.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/28_find_old_kde4_html_documentation.diff	2010-05-28 20:27:47 UTC (rev 18098)
@@ -0,0 +1,25 @@
+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
+@@ -1796,6 +1796,11 @@ void KStandardDirs::addKDEDefaults()
+ 
+     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", "/usr/share/doc/kde4/HTML", false);
+ }
+ 
+ static QStringList lookupProfiles(const QString &mapFile)

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-05-28 20:08:17 UTC (rev 18097)
+++ trunk/packages/kdelibs/debian/patches/series	2010-05-28 20:27:47 UTC (rev 18098)
@@ -14,5 +14,5 @@
 23_solid_no_double_build.diff
 25_ld_exclude_libs_qtuitools.diff
 27_konsole_kfreebsd_fix.diff
-28_find_kde3_html_documentation.diff
+28_find_old_kde4_html_documentation.diff
 29_hurd_support.diff