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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5401c89fa0bde38b6704332508dc9014b9ae3413
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Oct 18 14:47:56 2016 +0200

    Revert "Add patches from master to find utempter"
    
    This reverts commit aed83b6836d04c2f07570812f472bc2a86bdaff2.
---
 ...h-to-find-utempter-binary-more-reliable-t.patch | 29 ----------------------
 ...karound-find_program-utempter-.-failure-s.patch | 29 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 60 deletions(-)

diff --git a/debian/patches/0001-use-ECM-path-to-find-utempter-binary-more-reliable-t.patch b/debian/patches/0001-use-ECM-path-to-find-utempter-binary-more-reliable-t.patch
deleted file mode 100644
index 77fd508..0000000
--- a/debian/patches/0001-use-ECM-path-to-find-utempter-binary-more-reliable-t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 394eeff0dfba16de7418a25810edde66de541d61 Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr at jriddell.org>
-Date: Tue, 4 Oct 2016 11:19:36 +0100
-Subject: [PATCH 1/3] use ECM path to find utempter binary, more reliable than
- simple cmake prefix
-
-REVIEW:129090
----
- cmake/FindUTEMPTER.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
-index 8e16d69..9773963 100644
---- a/cmake/FindUTEMPTER.cmake
-+++ b/cmake/FindUTEMPTER.cmake
-@@ -33,8 +33,8 @@
- 
- 
- find_program (UTEMPTER_EXECUTABLE utempter PATHS
--    ${CMAKE_PREFIX_PATH}/libexec/utempter
--    ${CMAKE_PREFIX_PATH}/lib/utempter
-+    ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter
-+    ${KDE_INSTALL_FULL_LIBDIR}/utempter
-     /usr/libexec/utempter
- )
- 
--- 
-2.9.3
-
diff --git a/debian/patches/0003-workaround-find_program-utempter-.-failure-s.patch b/debian/patches/0003-workaround-find_program-utempter-.-failure-s.patch
deleted file mode 100644
index 7780361..0000000
--- a/debian/patches/0003-workaround-find_program-utempter-.-failure-s.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 86d24c5e9eb0e6bde9fa4f5018d9bb0009ee7ade Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter at math.unl.edu>
-Date: Tue, 11 Oct 2016 16:16:51 -0500
-Subject: [PATCH 3/3] workaround find_program ( utempter ...) failure(s)
-
-See also upstream cmake issue:
-https://gitlab.kitware.com/cmake/cmake/issues/10468
----
- cmake/FindUTEMPTER.cmake | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
-index 9773963..2fc1cd8 100644
---- a/cmake/FindUTEMPTER.cmake
-+++ b/cmake/FindUTEMPTER.cmake
-@@ -32,7 +32,9 @@
- # SUCH DAMAGE.
- 
- 
--find_program (UTEMPTER_EXECUTABLE utempter PATHS
-+# use find_file instead of find_program until this is fixed:
-+# https://gitlab.kitware.com/cmake/cmake/issues/10468
-+find_file (UTEMPTER_EXECUTABLE utempter PATHS
-     ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter
-     ${KDE_INSTALL_FULL_LIBDIR}/utempter
-     /usr/libexec/utempter
--- 
-2.9.3
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 06ad550..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-use-ECM-path-to-find-utempter-binary-more-reliable-t.patch
-0003-workaround-find_program-utempter-.-failure-s.patch

-- 
kpty packaging