[SCM] kio packaging branch, master, updated. debian/5.15.0-1-5-gd0eb9d3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bcf077971b3545376e9839023ae66a5bfcf0ea80
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Nov 19 10:44:23 2015 +0100

    Refresh patches.
---
 debian/changelog                               |  1 +
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd2b677..dfff376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kio (5.16.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.16.0).
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 17 Nov 2015 11:48:27 +0100
 
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 89f9319..adb976f 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -1,12 +1,14 @@
---- 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
+Index: kio/src/ioslaves/help/kio_help.cpp
+===================================================================
+--- kio.orig/src/ioslaves/help/kio_help.cpp	2015-11-19 14:33:04.080944405 +0100
++++ kio/src/ioslaves/help/kio_help.cpp	2015-11-19 14:36:35.272354243 +0100
 @@ -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);
+-    const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
++    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();
-     langs.append("en");
+     langs.append(QStringLiteral("en"));

-- 
kio packaging