[SCM] konsole packaging branch, master, updated. debian/4.8.4-1-3-gf10e5ad

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=f10e5ad

The following commit has been merged in the master branch:
commit f10e5ad53e8dbd3c58ec6be8317038cb963e10bb
Author: Pino Toscano <pino at debian.org>
Date:   Thu Nov 1 15:10:02 2012 +0100

    avoid looking up executables when an absolute path is specified
    
    backport upstream commit e48cee6cca742a5bdb3daf6fa0b7c76073217faa
---
 debian/changelog                                   |    5 +++
 debian/patches/series                              |    1 +
 ...lookup-executable-PATH-when-absolute-path.patch |   30 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 726756c..bf56122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ 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 <debian-qt-kde at lists.debian.org>  Tue, 23 Oct 2012 18:29:05 -0300
 
 konsole (4:4.8.4-1) unstable; urgency=low
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 <adaptee at gmail.com>
+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
+

-- 
konsole packaging