[SCM] kauth packaging branch, kubuntu_unstable, updated. 06ceab7392cbb591b96aedb885925deccc6355ff
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Oct 21 07:12:48 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kauth.git;a=commitdiff;h=06ceab7
The following commit has been merged in the kubuntu_unstable branch:
commit 06ceab7392cbb591b96aedb885925deccc6355ff
Author: Harald Sitter <sitter at kde.org>
Date: Tue Oct 21 09:12:20 2014 +0200
drop upstream patches
---
debian/patches/series | 1 -
debian/patches/upstream_cmake-paths.diff | 27 ---------------------------
2 files changed, 28 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f339094..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_cmake-paths.diff
diff --git a/debian/patches/upstream_cmake-paths.diff b/debian/patches/upstream_cmake-paths.diff
deleted file mode 100644
index 19e6dbb..0000000
--- a/debian/patches/upstream_cmake-paths.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-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
More information about the pkg-kde-commits
mailing list