[SCM] kio packaging branch, kubuntu_wily_backports, updated. ubuntu/5.15.0-0ubuntu3-52-ga3d838d

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 372328564601e8add345a09aef9ba5c94bd9cc80
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Nov 5 21:50:20 2015 +0100

    Fix more fuzz in kubuntu_kde4lib4-docs-path.diff
---
 debian/changelog                               | 1 +
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc809b2..b581368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kio (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
   * Vivid backport. 
   * Refresh patch kubuntu_kde4lib4-docs-path.diff
   * Correctly fix the fuzz on aforementioned patch. 
+  * Fix more fuzz in kubuntu_kde4lib4-docs-path.diff 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 22:59:21 -0700
 
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 0d0d410..706f9cf 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -13,8 +13,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      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);
+-    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, "doc/kde/HTML", QStandardPaths::LocateDirectory);
  
      QStringList langs = QLocale().uiLanguages();

-- 
kio packaging