[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 265ca040d82c47dfd45957afb39fa9a050e57d22
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 14:02:39 2017 +0200

    Add upstream patch: Fix-opening-of-new-tabs-with-multiple-processes.patch
---
 ...ening-of-new-tabs-with-multiple-processes.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch b/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch
new file mode 100644
index 0000000..e88ad25
--- /dev/null
+++ b/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch
@@ -0,0 +1,27 @@
+From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
+Date: Wed, 25 Jan 2017 22:25:48 +0100
+Subject: Fix opening of new tabs with multiple processes
+
+Make sure we re-use the process if the user wants a new tab.
+
+BUG: 373440
+REVIEW: 129886
+---
+ src/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index fb53560e..db3b83bf 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -121,8 +121,8 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
+     parser->process(args);
+     about.processCommandLine(parser.data());
+ 
+-    // Enable user to force multiple instances
+-    if (!Konsole::KonsoleSettings::useSingleInstance()) {
++    // Enable user to force multiple instances, unless a new tab is requested
++    if (!Konsole::KonsoleSettings::useSingleInstance() && !parser->isSet(QStringLiteral("new-tab"))) {
+         startupOption = KDBusService::Multiple;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 320cefa..8ce772e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Fix-word-boundaries-with-combining-characters.patch
 Don-t-include-newlines-in-selection-if-trimming-is-on.patch
 Limit-ourselves-to-3-combining-characters.patch
 Fix-opening-of-new-tabs-with-multiple-processes.patch
+Allow-ANSI-string-terminator-to-work.patch

-- 
konsole packaging