[SCM] kauth packaging branch, master, updated. debian/5.37.0-2-114-g6f8ad2e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 85c0df70d1e9f628f7497f9e72d90206a565dc03
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 25 10:14:43 2018 -0300

    Rediff patches
    
    Add make_kauth-gen-policy_useful_for_crosscompiling.path: <REASON>
    Drop make_kauth-gen-policy_usefull_for_crosscompiling.path: <REASON>
---
 ...kauth-gen-policy_useful_for_crosscompiling.path | 30 ++++++++++++++++++++++
 ...auth-gen-policy_usefull_for_crosscompiling.path | 23 -----------------
 debian/patches/series                              |  2 +-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/debian/patches/make_kauth-gen-policy_useful_for_crosscompiling.path b/debian/patches/make_kauth-gen-policy_useful_for_crosscompiling.path
new file mode 100644
index 0000000..eaf57b6
--- /dev/null
+++ b/debian/patches/make_kauth-gen-policy_useful_for_crosscompiling.path
@@ -0,0 +1,30 @@
+From: =?utf-8?q?Sandro_Kanu=C3=9F?= <hefee at debian.org>
+Date: Thu, 25 Jan 2018 10:02:33 -0300
+Subject: Make kauth-gen-policy useful 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.
+
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/887521
+Last-Update: 2018-01-21
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddb5f55..cce4654 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KAUTH
+ 
+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+ 
+-set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth")
++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}/kauth" CACHE STRING "Set directory for kauth helper tool")
+ 
+ if(IS_ABSOLUTE ${KAUTH_HELPER_INSTALL_DIR})
+     set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR ${KAUTH_HELPER_INSTALL_DIR})
diff --git a/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path b/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path
deleted file mode 100644
index 46747ae..0000000
--- a/debian/patches/make_kauth-gen-policy_usefull_for_crosscompiling.path
+++ /dev/null
@@ -1,23 +0,0 @@
-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
index 12de32b..5e1ff39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-make_kauth-gen-policy_usefull_for_crosscompiling.path
+make_kauth-gen-policy_useful_for_crosscompiling.path

-- 
kauth packaging