[SCM] konsole packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-35-g5ce2953

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5ce2953692ca6cb62f440bba7ecae95b042cb49a
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 9 09:53:56 2015 +0100

    .
---
 debian/patches/series                      |  1 -
 debian/patches/upstream_control-space.diff | 33 ------------------------------
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 24ad6f8..bccb940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian-T-addition.diff
-upstream_control-space.diff
diff --git a/debian/patches/upstream_control-space.diff b/debian/patches/upstream_control-space.diff
deleted file mode 100644
index 9bcf539..0000000
--- a/debian/patches/upstream_control-space.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix control-space in konsole
- make emacs users happy
-Origin: upstream, https://git.reviewboard.kde.org/r/122711/
-Bug: https://bugs.kde.org/show_bug.cgi?id=341157
-Last-Update: 2015-03-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp
-index 5bdc62b..d0043c4 100644
---- a/src/KeyboardTranslator.cpp
-+++ b/src/KeyboardTranslator.cpp
-@@ -523,7 +523,7 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
-             }
- 
-             if (escapedChar)
--                result.replace(i, charsToRemove, replacement);
-+	         result.replace(i, charsToRemove, replacement, 1);
-         }
-     }
- 
-diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
-index d0d60ce..1e6dbf6 100644
---- a/src/Vt102Emulation.cpp
-+++ b/src/Vt102Emulation.cpp
-@@ -1046,7 +1046,7 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent* event)
-         }
-         else if (!entry.text().isEmpty())
-         {
--            textToSend += _codec->fromUnicode(entry.text(true,modifiers));
-+            textToSend += entry.text(true,modifiers);
-         }
-         else
-             textToSend += _codec->fromUnicode(event->text());

-- 
konsole packaging