[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=e9473cb

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

    Correctly fix the fuzz on aforementioned patch.
---
 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 d1d8f34..fc809b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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. 
 
  -- 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 24b2427..0d0d410 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -13,9 +13,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      QStringList search;
  
      // assemble the local search paths
--    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
+-    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");
+     langs.append(QStringLiteral("en"));

-- 
kio packaging