[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.18.0-0ubuntu1-37-g5d13081

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5d13081acb35e3105a415b57290d89f7aa41da13
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Mar 16 12:01:14 2016 +0000

    Refreshing kubuntu_kdelibs4-docs-path.diff
---
 debian/changelog                               |  1 +
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2424bf3..b64cd6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kio (5.19.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Refreshing symbols
+  * Refreshing kubuntu_kdelibs4-docs-path.diff
 
  -- Clive Johnston <clivejo at aol.com>  Thu, 25 Feb 2016 17:23:06 +0000
 
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index bc73953..ce218a4 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -7,9 +7,11 @@ Reviewed-by: Jonathan Riddell
 Last-Update: 2015-03-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- 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 @@
+Index: kio/src/ioslaves/help/kio_help.cpp
+===================================================================
+--- kio.orig/src/ioslaves/help/kio_help.cpp
++++ kio/src/ioslaves/help/kio_help.cpp
+@@ -50,7 +50,8 @@ QString HelpProtocol::langLookup(const Q
      QStringList search;
  
      // assemble the local search paths
@@ -17,5 +19,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
 +    localDoc << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,QStringLiteral("doc/kde/HTML"), QStandardPaths::LocateDirectory);
  
-     QStringList langs = QLocale().uiLanguages();
+     QStringList langs = KLocalizedString::languages();
      langs.append(QStringLiteral("en"));

-- 
kio packaging