[SCM] kio packaging branch, kubuntu_vivid_archive, updated. be77a0b4d9dafad99f8df036026f4d29ded3a74d

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=be77a0b

The following commit has been merged in the kubuntu_vivid_archive branch:
commit be77a0b4d9dafad99f8df036026f4d29ded3a74d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 2 17:20:36 2015 +0200

    Add kubuntu_kdelibs4-docs-path.diff to search in kdelibs4 path
---
 debian/changelog                               |  6 ++++++
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 12 ++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d36144b..86642d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kio (5.8.0-0ubuntu2) vivid; urgency=medium
+
+  * Add kubuntu_kdelibs4-docs-path.diff to search in kdelibs4 path
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 17:19:09 +0200
+
 kio (5.8.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
new file mode 100644
index 0000000..89f9319
--- /dev/null
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -0,0 +1,12 @@
+--- kio/src/ioslaves/help/kio_help.cpp	2015-03-07 15:45:21.000000000 +0100
++++ kio/src/ioslaves/help/kio_help.cpp	2015-04-02 17:15:39.687828131 +0200
+@@ -49,7 +49,8 @@
+     QStringList search;
+ 
+     // assemble the local search paths
+-    const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
++    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
++    localDoc << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory);
+ 
+     QStringList langs = QLocale().uiLanguages();
+     langs.append("en");
diff --git a/debian/patches/series b/debian/patches/series
index 0a1e4ba..5a3e920 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream-almost_kurlcomboslash.patch
+kubuntu_kdelibs4-docs-path.diff

-- 
kio packaging