[SCM] kdoctools packaging branch, master, updated. debian/5.28.0-2-22-gd83a5de

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 985700855bd1c8ec5948776f25c1da9e2efaa245
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 14 23:47:52 2017 +0200

    Add migrated patch: add-search-paths-for-kdelibs4-docs.patch
---
 .../add-search-paths-for-kdelibs4-docs.patch       | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/add-search-paths-for-kdelibs4-docs.patch b/debian/patches/add-search-paths-for-kdelibs4-docs.patch
new file mode 100644
index 0000000..35ec6d4
--- /dev/null
+++ b/debian/patches/add-search-paths-for-kdelibs4-docs.patch
@@ -0,0 +1,25 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Fri, 14 Jul 2017 23:45:58 +0200
+Subject: add search paths for kdelibs4 docs
+
+This patch was migrated from kio
+(https://anonscm.debian.org/git/pkg-kde/frameworks/kio.git/commit/?id=26acc0174710a967e82b2f070f4e8ac95f8d7292)
+
+Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
+---
+ src/xslt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/xslt.cpp b/src/xslt.cpp
+index c73c202..6a00f1d 100644
+--- a/src/xslt.cpp
++++ b/src/xslt.cpp
+@@ -494,5 +494,7 @@ QStringList getKDocToolsCatalogs()
+ QStringList KDocTools::documentationDirs()
+ {
+     /* List of paths containing documentation */
+-    return 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);
++    return localDoc;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..76b2e79
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-search-paths-for-kdelibs4-docs.patch

-- 
kdoctools packaging