[SCM] kpty packaging branch, master, updated. debian/5.28.0-2-11-g7e8cf71

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 299065026f32678ec63a8c794e6f7b29a9cbaf86
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jun 29 12:28:23 2017 +0200

    Drop upstream patches
---
 ...-so-utempter-binary-is-found-in-Ubuntu-16.patch | 21 -----------------
 debian/patches/REVIEW-129560.patch                 | 27 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 50 deletions(-)

diff --git a/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch b/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
deleted file mode 100644
index ecd28d5..0000000
--- a/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Albert Astals Cid <aacid at kde.org>
-Date: Wed, 9 Nov 2016 23:36:36 +0100
-Subject: Add library path so utempter binary is found in Ubuntu 16.10
-
-REVIEW: 129361
----
- cmake/FindUTEMPTER.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
-index d3236c8..c5a1e41 100644
---- a/cmake/FindUTEMPTER.cmake
-+++ b/cmake/FindUTEMPTER.cmake
-@@ -40,6 +40,7 @@ find_file (UTEMPTER_EXECUTABLE utempter PATHS
-     ${CMAKE_PREFIX_PATH}/libexec/utempter
-     ${CMAKE_PREFIX_PATH}/lib/utempter
-     /usr/libexec/utempter
-+    /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/utempter
- )
- 
- # On FreeBSD for example we have to use ulog-helper
diff --git a/debian/patches/REVIEW-129560.patch b/debian/patches/REVIEW-129560.patch
deleted file mode 100644
index 5507235..0000000
--- a/debian/patches/REVIEW-129560.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Jonathan Riddell <jr at jriddell.org>
-Date: Mon, 28 Nov 2016 14:50:17 +0000
-Subject: REVIEW:129560 More utempter path searching,
- this one to keep Debian stable happy
-
----
- cmake/FindUTEMPTER.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 15c0e29..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
-REVIEW-129560.patch

-- 
kpty packaging