[SCM] kpty packaging branch, master, updated. debian/5.37.0-2-96-g6d8962f

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:51:19 UTC 2018


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

The following commit has been merged in the master branch:
commit 9ede73ca0f30e7f4bc594345ef2d1f490b66a1f7
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Nov 28 14:52:47 2016 +0000

    bring back kde_01_search_utempter.diff for Debian stable happyness
---
 debian/patches/kde_01_search_utempter.diff | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/debian/patches/kde_01_search_utempter.diff b/debian/patches/kde_01_search_utempter.diff
new file mode 100644
index 0000000..7ea3d76
--- /dev/null
+++ b/debian/patches/kde_01_search_utempter.diff
@@ -0,0 +1,25 @@
+commit 053ee8add12db44e6eaa68fd02e34ef1b97ba528
+Author: Jonathan Riddell <jr at jriddell.org>
+Date:   Mon Nov 28 14:50:17 2016 +0000
+
+    REVIEW:129560
+    More utempter path searching, this one to keep Debian stable happy
+
+diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
+index c5a1e41..c6352f5 100644
+--- a/cmake/FindUTEMPTER.cmake
++++ b/cmake/FindUTEMPTER.cmake
+@@ -37,10 +37,11 @@
+ find_file (UTEMPTER_EXECUTABLE utempter PATHS
+     ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter
+     ${KDE_INSTALL_FULL_LIBDIR}/utempter
+-    ${CMAKE_PREFIX_PATH}/libexec/utempter
+-    ${CMAKE_PREFIX_PATH}/lib/utempter
++    ${CMAKE_INSTALL_PREFIX}/libexec/utempter
++    ${CMAKE_INSTALL_PREFIX}/lib/utempter
+     /usr/libexec/utempter
+     /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/utempter
++    /usr/lib/utempter
+ )
+ 
+ # On FreeBSD for example we have to use ulog-helper

-- 
kpty packaging



More information about the pkg-kde-commits mailing list