[SCM] kauth packaging branch, kubuntu_unstable, updated. d7c5fbad255b146caf939fc1500370fe465ea044

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d7c5fbad255b146caf939fc1500370fe465ea044
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Oct 20 16:11:46 2014 +0200

    Add upstream_cmake-paths.diff to fix install paths
---
 debian/changelog                         |  6 ++++++
 debian/patches/series                    |  1 +
 debian/patches/upstream_cmake-paths.diff | 27 +++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9bbd14f..9afe706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kauth (5.3.0-0ubuntu2) utopic; urgency=medium
+
+  * Add upstream_cmake-paths.diff to fix install paths
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 20 Oct 2014 15:21:31 +0200
+
 kauth (5.3.0-0ubuntu1) utopic; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f339094
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_cmake-paths.diff
diff --git a/debian/patches/upstream_cmake-paths.diff b/debian/patches/upstream_cmake-paths.diff
new file mode 100644
index 0000000..19e6dbb
--- /dev/null
+++ b/debian/patches/upstream_cmake-paths.diff
@@ -0,0 +1,27 @@
+commit c07b883d938893791346f3ea8283c123fb722ac8
+Author: David Edmundson <kde at davidedmundson.co.uk>
+Date:   Wed Oct 15 22:46:20 2014 +0200
+
+    Use officially exported cmake paths
+    
+    PLUGIN_INSTALL_DIR is not documented in the header of KDEInstallDirs
+    
+    More importantly on builds that use KDE_INSTALL_USE_QT_SYS_PATHS this is
+    relative, whereas normally it's absolute.
+    
+    By using the CMAKE_INSTALL_FULL path we avoid that problem as it goes
+    through the define_relatve define_absolute macros.
+    
+    REVIEW: 120603
+    BUG: 339539
+
+diff --git a/src/BackendsConfig.h.cmake b/src/BackendsConfig.h.cmake
+index 9b82fb8..f2be6c1 100644
+--- a/src/BackendsConfig.h.cmake
++++ b/src/BackendsConfig.h.cmake
+@@ -1,3 +1,3 @@
+ #cmakedefine01 KAUTH_COMPILING_FAKE_BACKEND
+-#define KAUTH_BACKEND_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/${KAUTH_BACKEND_PLUGIN_DIR}"
+-#define KAUTH_HELPER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/${KAUTH_HELPER_PLUGIN_DIR}"
++#define KAUTH_BACKEND_PLUGIN_DIR "${CMAKE_INSTALL_FULL_PLUGINDIR}/${KAUTH_BACKEND_PLUGIN_DIR}"
++#define KAUTH_HELPER_PLUGIN_DIR "${CMAKE_INSTALL_FULL_PLUGINDIR}/${KAUTH_HELPER_PLUGIN_DIR}"

-- 
kauth packaging