[SCM] kauth packaging branch, master, updated. debian/5.37.0-2-109-g294e9c8

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 7a63e2d12e6c8e8ef251872c3c86a0b36c0618f9
Author: Sandro Knauß <sknauss at kde.org>
Date:   Tue Jan 23 15:11:01 2018 +0100

    Added patch to make kauth-gen-policy ready for cross compilation.
---
 debian/changelog                                   |  5 +++++
 ...auth-gen-policy_usefull_for_crosscompiling.path | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3e4cea..6f525de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 kauth (5.42.0-1~) UNRELEASED; urgency=medium
 
+  [ Maximiliano Curia ]
   * New upstream release (5.42.0).
 
+  [ Sandro Knauß ]
+  * Added patch to make kauth-gen-policy ready for cross compilation 
+    (Closes: #887521)
+
  -- Maximiliano Curia <maxy at debian.org>  Mon, 22 Jan 2018 16:21:48 -0300
 
 kauth (5.41.0-1) experimental; urgency=medium
diff --git a/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path b/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path
new file mode 100644
index 0000000..46747ae
--- /dev/null
+++ b/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path
@@ -0,0 +1,23 @@
+Description: Make pacakge usefull for cross compilation
+ kauth-gen-policy appears to be a tool for turning a text file in
+ qsettings format (similar to .ini) into an xml file. Both are textual,
+ so it seems like putting kauth-gen-policy into a Multi-Arch: foreign
+ package (like kconfig_compiler_kf5 in #887452). Thus we can draw the
+ same conclusion.
+Author: Sandro Kanuß <hefee at debian.org>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/887521
+Last-Update: 2018-01-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFI
+ 
+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+ 
+-set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth")
++option(KAUTH_HELPER_INSTALL_DIR "Set directory for kauth helper tool" "${KDE_INSTALL_LIBEXECDIR}/kauth")
+ 
+ if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR})
+     set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12de32b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+make_kauth-gen-policy_usefull_for_crosscompiling.path
diff --git a/debian/rules b/debian/rules
index 6c7279c..d1aa905 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export QT_SELECT=5
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DKAUTH_HELPER_INSTALL_DIR="lib/kauth/libexec"
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5auth5-dbg (<= 5.19.0-1~~)'

-- 
kauth packaging