[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=820997f

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

    Update patches.
---
 debian/changelog                                   |    7 +++++
 debian/patches/debian-T-addition.diff              |   14 +++++-----
 debian/patches/one_profile_per_window.diff         |   25 --------------------
 debian/patches/series                              |    1 -
 ...lookup-executable-PATH-when-absolute-path.patch |   11 ++------
 5 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 377e024..5563580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ konsole (4:4.9.5-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
+  [ José Manuel Santamaría Lema ]
+  * Update patches:
+    - drop one_profile_per_window.diff, problem solved upstream.
+    - refresh debian-T-addition.diff.
+    - refresh upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
+      to make it apply without any offset.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Jan 2013 23:49:28 +0100
 
 konsole (4:4.8.4-2) unstable; urgency=low
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index 8088ea7..afa01c0 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,10 +1,10 @@
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -122,6 +122,7 @@ void fillCommandLineOptions(KCmdLineOpti
-     // TODO - Document this option more clearly
-     options.add("p <property=value>",ki18n("Change the value of a profile property."));
-     options.add("list-profile-properties", ki18n("List all the profile properties names and their type (for use with -p)"));
+@@ -183,6 +183,7 @@ void fillCommandLineOptions(KCmdLineOpti
+                       " (for use with -p)"));
+     options.add("p <property=value>",
+                 ki18n("Change the value of a profile property."));
 +    options.add("T <value>", ki18n("Debian policy compatibility, not used"));
-     options.add("!e <cmd>",ki18n("Command to execute"));
-     options.add("+[args]",ki18n("Arguments passed to command"));
-     options.add("", ki18n("Use --nofork to run in the foreground (helpful with the -e option)."));
+     options.add("!e <cmd>",
+                 ki18n("Command to execute. This option will catch all following"
+                       " arguments, so use it as the last option."));
diff --git a/debian/patches/one_profile_per_window.diff b/debian/patches/one_profile_per_window.diff
deleted file mode 100644
index 65b8562..0000000
--- a/debian/patches/one_profile_per_window.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Description: This patch reverts the following upstream commit: 
- https://projects.kde.org/projects/kde/kde-baseapps/konsole/repository/revisions/6167fc97
- This patch MUST be removed for 4.9.x since the lost functionality would be
- available as a new "Clone Tab" action.
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -397,14 +397,12 @@ void MainWindow::openUrls(const QList<KUrl>& urls)
- 
- void MainWindow::newTab()
- {
--    Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile();
--    emit newSessionRequest(defaultProfile , activeSessionDir() , _viewManager);
-+    emit newSessionRequest( _defaultProfile , activeSessionDir() , _viewManager);
- }
- 
- void MainWindow::newWindow()
- {
--    Profile::Ptr defaultProfile = SessionManager::instance()->defaultProfile();
--    emit newWindowRequest(defaultProfile , activeSessionDir());
-+    emit newWindowRequest( _defaultProfile , activeSessionDir() );
- }
- 
- bool MainWindow::queryClose()
-
diff --git a/debian/patches/series b/debian/patches/series
index 5047970..e5bf34a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-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
index 4d2d53c..5b0b559 100644
--- 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
@@ -9,13 +9,11 @@ Subject: [PATCH] No need to lookup executable PATH when absolute path is
  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();
+@@ -385,6 +385,11 @@ QString Session::checkProgram(const QStr
+         return exec;
+     }
  
 +    QFileInfo info(exec);
 +    if (info.isAbsolute() && info.exists() && info.isExecutable()) {
@@ -25,6 +23,3 @@ index 732858d..cf325b0 100644
      exec = KRun::binaryName(exec, false);
      exec = KShell::tildeExpand(exec);
      QString pexec = KStandardDirs::findExe(exec);
--- 
-1.7.10.4
-

-- 
konsole packaging