[SCM] kdoctools packaging branch, master, updated. debian/5.28.0-1-4-g5cf149c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 08b9e1373a949df832cf341988d728539380b9b9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Apr 2 11:12:10 2017 +0200

    Add new upstream patch: kdoctools_install-match-the-full-path-for-the-program.patch
---
 ...stall-match-the-full-path-for-the-program.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/kdoctools_install-match-the-full-path-for-the-program.patch b/debian/patches/kdoctools_install-match-the-full-path-for-the-program.patch
new file mode 100644
index 0000000..39adaa7
--- /dev/null
+++ b/debian/patches/kdoctools_install-match-the-full-path-for-the-program.patch
@@ -0,0 +1,40 @@
+From: Luigi Toscano <luigi.toscano at tiscali.it>
+Date: Mon, 2 Jan 2017 00:12:40 +0100
+Subject: kdoctools_install: match the full path for the program
+
+Summary:
+In order to get the name of the program, match against the full path
+which includes the path of the directory currently scanned for a
+certain language.
+So if docs/ appears somewhere in the path, it does not interfere
+with the matching regular expression and the name of the program
+is correctly extracted.
+
+BUG: 374435
+
+Test Plan: kdoctools_install(l10n-docs) now works
+
+Reviewers: #frameworks, #documentation, aacid
+
+Reviewed By: #documentation, aacid
+
+Tags: #frameworks, #documentation
+
+Differential Revision: https://phabricator.kde.org/D3912
+---
+ KF5DocToolsMacros.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake
+index d73201d..d294f98 100644
+--- a/KF5DocToolsMacros.cmake
++++ b/KF5DocToolsMacros.cmake
+@@ -243,7 +243,7 @@ function(kdoctools_install podir)
+                     INSTALL_DESTINATION ${MAN_INSTALL_DIR}/${lang}
+                 )
+             else()
+-                string(REGEX MATCH "docs/(.*)/index.docbook" match ${docbook})
++                string(REGEX MATCH "${lang_dir}/docs/(.*)/index.docbook" match ${docbook})
+                 if (match)
+                     kdoctools_create_handbook(${docbook}
+                         INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${lang}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c0ff27e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kdoctools_install-match-the-full-path-for-the-program.patch

-- 
kdoctools packaging