[SCM] kio packaging branch, master, updated. debian/5.28.0-2-24-g86815df

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 26acc0174710a967e82b2f070f4e8ac95f8d7292
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jul 9 13:03:45 2017 +0200

    Drop obsolete patch
    
    We might need to port this to kdoctools.
---
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 23 -----------------------
 debian/patches/series                          |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
deleted file mode 100644
index 30b8df3..0000000
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jonathan Riddell <jr at jriddell.org>
-Date: Sun, 15 May 2016 21:03:09 +0200
-Subject: kubuntu_kdelibs4-docs-path
-
-add search paths for kdelibs4 docs
-
-Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
----
- src/ioslaves/help/kio_help.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/ioslaves/help/kio_help.cpp
-+++ b/src/ioslaves/help/kio_help.cpp
-@@ -51,7 +51,8 @@
-     QStringList search;
- 
-     // assemble the local search paths
--    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 = KLocalizedString::languages();
-     langs.append(QStringLiteral("en"));
diff --git a/debian/patches/series b/debian/patches/series
index 5d79514..d1a69d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 return_on_ACCESS_DENIED
 report_error_removing_dirs
 wait_for_a_bit_longer
-kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
 fix_hurd_build.patch

-- 
kio packaging