[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=30ce612

The following commit has been merged in the kubuntu_wily_backports branch:
commit 30ce61244dd49e7c58f0077d4c78f82d53947baa
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Nov 5 20:19:10 2015 +0100

    Refresh patch kubuntu_kde4lib4-docs-path.diff
---
 debian/changelog                               | 1 +
 debian/control                                 | 2 +-
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd4c3a1..d1d8f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kio (5.15.0-0ubuntu2) UNRELEASED; urgency=medium
 
   * Vivid backport. 
+  * Refresh patch kubuntu_kde4lib4-docs-path.diff
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 08 Oct 2015 22:59:21 -0700
 
diff --git a/debian/control b/debian/control
index b5136e3..1e156b9 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Package: kio
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
-        kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
+        kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6)
 Replaces: kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
           kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6),
           libkonq5-templates (<< 4:15.12)
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index 42bb298..24b2427 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -13,7 +13,7 @@ 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);
 +    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
 +    localDoc << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory);
  

-- 
kio packaging