Your message dated Sun, 09 Dec 2012 00:01:06 +0100
with message-id <[email protected]>
and subject line Re: Bug#694617: unblock (pre-approval): konsole/4:4.8.4-2
has caused the Debian Bug report #694617,
regarding unblock (pre-approval): konsole/4:4.8.4-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
694617: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694617
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Hi,
I would like to upload konsole 4:4.8.4-2 with the following two
changes:
- konsole-dbg recommends kdelibs5-dbg
- backport an upstream patch to simplify/fix the search of executables;
upstream recommended us to provide it, he fixed that while working
on another bug
Attached the current diff out of the packaging repo of the changes
above.
Thanks,
--
Pino
diff --git a/debian/changelog b/debian/changelog
index 5afb9a2..bf56122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+konsole (4:4.8.4-2) UNRELEASED; urgency=low
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * konsole-dbg now recommends kdelibs5-dbg.
+
+ [ Pino Toscano ]
+ * Backport upstream commit e48cee6cca742a5bdb3daf6fa0b7c76073217faa to avoid
+ looking up executables when an absolute path is specified; patch
+ upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch.
+
+ -- Debian Qt/KDE Maintainers <[email protected]> Tue, 23 Oct 2012 18:29:05 -0300
+
konsole (4:4.8.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 755aaf2..2daa69c 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Priority: extra
Depends: ${misc:Depends}, konsole (= ${binary:Version})
Breaks: kdebase-dbg (<< 4:4.6.80)
Replaces: kdebase-dbg (<< 4:4.6.80)
+Recommends: kdelibs5-dbg
Description: debugging symbols for the KDE X terminal emulator
This package contains debugging files used to investigate problems with
binaries included in the KDE X terminal emulator.
diff --git a/debian/patches/series b/debian/patches/series
index 93acb4d..5047970 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
one_profile_per_window.diff
debian-T-addition.diff
+upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
diff --git a/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch b/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
new file mode 100644
index 0000000..4d2d53c
--- /dev/null
+++ b/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
@@ -0,0 +1,30 @@
+From e48cee6cca742a5bdb3daf6fa0b7c76073217faa Mon Sep 17 00:00:00 2001
+From: Jekyll Wu <[email protected]>
+Date: Thu, 1 Nov 2012 11:57:42 +0800
+Subject: [PATCH] No need to lookup executable PATH when absolute path is
+ given (cherry picked from commit
+ d12aead588ec09359633eb9de5f9ac2b2a7e1e06)
+
+---
+ src/Session.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/Session.cpp b/src/Session.cpp
+index 732858d..cf325b0 100644
+--- a/src/Session.cpp
++++ b/src/Session.cpp
+@@ -369,6 +369,11 @@ QString Session::checkProgram(const QString& program)
+ if (exec.isEmpty())
+ return QString();
+
++ QFileInfo info(exec);
++ if (info.isAbsolute() && info.exists() && info.isExecutable()) {
++ return exec;
++ }
++
+ exec = KRun::binaryName(exec, false);
+ exec = KShell::tildeExpand(exec);
+ QString pexec = KStandardDirs::findExe(exec);
+--
+1.7.10.4
+
--- End Message ---
--- Begin Message ---
On 2012-12-08 16:59, Pino Toscano wrote:
> [...]
>
> Thank you; it has been uploaded a couple of hours ago, and built fine
> everywhere.
>
> Thanks,
Unblocked, thanks.
~Niels
--- End Message ---
