Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
I've backported two upstream fixes in kpty for stretch related to the internal
utempter plugin:
Add stretch's path for utempter (97876c1)
Add jessies's path for utempter (053ee8a)
I've uploaded 5.28.0-2 to unstable with these patches, and it built
successfully in all the release architectures.
I'm attaching the corresponding debdiff.
Happy hacking,
Please unblock package kpty
unblock kpty/5.28.0-2
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500,
'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
diff -Nru kpty-5.28.0/debian/changelog kpty-5.28.0/debian/changelog
--- kpty-5.28.0/debian/changelog 2016-11-18 16:04:21.000000000 +0100
+++ kpty-5.28.0/debian/changelog 2017-04-06 14:03:55.000000000 +0200
@@ -1,3 +1,11 @@
+kpty (5.28.0-2) unstable; urgency=medium
+
+ * Add new upstream patches to find utempter:
+ Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch and
+ REVIEW-129560.patch
+
+ -- Maximiliano Curia <m...@debian.org> Thu, 06 Apr 2017 14:03:55 +0200
+
kpty (5.28.0-1) unstable; urgency=medium
[ Automatic packaging ]
diff -Nru
kpty-5.28.0/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
kpty-5.28.0/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
---
kpty-5.28.0/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
1970-01-01 01:00:00.000000000 +0100
+++
kpty-5.28.0/debian/patches/Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
2017-04-06 14:03:55.000000000 +0200
@@ -0,0 +1,21 @@
+From: Albert Astals Cid <aa...@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 -Nru kpty-5.28.0/debian/patches/REVIEW-129560.patch
kpty-5.28.0/debian/patches/REVIEW-129560.patch
--- kpty-5.28.0/debian/patches/REVIEW-129560.patch 1970-01-01
01:00:00.000000000 +0100
+++ kpty-5.28.0/debian/patches/REVIEW-129560.patch 2017-04-06
14:03:55.000000000 +0200
@@ -0,0 +1,27 @@
+From: Jonathan Riddell <j...@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 -Nru kpty-5.28.0/debian/patches/series kpty-5.28.0/debian/patches/series
--- kpty-5.28.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ kpty-5.28.0/debian/patches/series 2017-04-06 14:03:55.000000000 +0200
@@ -0,0 +1,2 @@
+Add-library-path-so-utempter-binary-is-found-in-Ubuntu-16.patch
+REVIEW-129560.patch
