[SCM] konsole packaging branch, kde4.9, updated. debian/4.8.4-2-5-g95b6d5d

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit d910732850bbdb576039aeaf8231802737af8742
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Jan 12 00:59:31 2013 +0100

    Actually this patch must be removed.
---
 debian/changelog                                   |    4 +-
 debian/patches/series                              |    1 -
 ...lookup-executable-PATH-when-absolute-path.patch |   25 --------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 740c2ee..0d4ad42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,9 @@ konsole (4:4.9.5-0r0) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Update patches:
     - drop one_profile_per_window.diff, problem solved upstream.
+    - drop upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch,
+      no longer needed.
     - refresh debian-T-addition.diff.
-    - refresh upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
-      to make it apply without any offset.
   * Bump kde-sc-dev-latest build dependency to version 4:4.9.5.
   * Bump build depends on other KDE SC components to 4:4.9.
 
diff --git a/debian/patches/series b/debian/patches/series
index e5bf34a..bccb940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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
deleted file mode 100644
index 5b0b559..0000000
--- a/debian/patches/upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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(+)
-
---- a/src/Session.cpp
-+++ b/src/Session.cpp
-@@ -385,6 +385,11 @@ QString Session::checkProgram(const QStr
-         return exec;
-     }
- 
-+    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);

-- 
konsole packaging