[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:20 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kpty.git;a=commitdiff;h=d44be03
The following commit has been merged in the master branch:
commit d44be031157e8c697b8091493925711b2dd694a4
Author: Rohan Garg <rohan at garg.io>
Date: Mon Nov 28 16:11:49 2016 +0100
Fix header and patch
---
debian/patches/kde_01_search_utempter.diff | 22 +++++++++-------------
debian/patches/series | 1 +
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/debian/patches/kde_01_search_utempter.diff b/debian/patches/kde_01_search_utempter.diff
index 7ea3d76..fb00ead 100644
--- a/debian/patches/kde_01_search_utempter.diff
+++ b/debian/patches/kde_01_search_utempter.diff
@@ -1,15 +1,14 @@
-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
+Description: More utempter path searching, this one to keep Debian stable happy
+Author: Jonathan Riddell
+Origin: upstream
+Forwarded: not-needed
+Applied-Upstream: http://commits.kde.org/kpty/053ee8add12db44e6eaa68fd02e34ef1b97ba528
+Last-Update: 2016-11-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/cmake/FindUTEMPTER.cmake
+++ b/cmake/FindUTEMPTER.cmake
-@@ -37,10 +37,11 @@
+@@ -37,8 +37,8 @@
find_file (UTEMPTER_EXECUTABLE utempter PATHS
${KDE_INSTALL_FULL_LIBEXECDIR}/utempter
${KDE_INSTALL_FULL_LIBDIR}/utempter
@@ -18,8 +17,5 @@ index c5a1e41..c6352f5 100644
+ ${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
diff --git a/debian/patches/series b/debian/patches/series
index b901de9..e75b1f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+
kde_01_search_utempter.diff
--
kpty packaging
More information about the pkg-kde-commits
mailing list