[SCM] konsole packaging branch, master, updated. debian/4.14.2-1-60-g485ae5c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 591dc258528453c4afa723c1993933e2841f9c60
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 27 18:04:17 2015 +0200

    Remove upstream patch: upstream_control-space.diff
---
 debian/changelog                           |  1 +
 debian/patches/debian-T-addition.diff      |  6 +++---
 debian/patches/series                      |  1 -
 debian/patches/upstream_control-space.diff | 33 ------------------------------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5574b9..0e3ef00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ konsole (4:15.04.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.04.0).
   * New upstream release (15.04.1).
+  * Remove upstream patch: upstream_control-space.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 May 2015 14:36:24 +0200
 
diff --git a/debian/patches/debian-T-addition.diff b/debian/patches/debian-T-addition.diff
index fb61327..99ddeb4 100644
--- a/debian/patches/debian-T-addition.diff
+++ b/debian/patches/debian-T-addition.diff
@@ -1,8 +1,8 @@
 Index: konsole/src/main.cpp
 ===================================================================
---- konsole.orig/src/main.cpp	2013-09-26 13:02:46.456857435 +0000
-+++ konsole/src/main.cpp	2013-09-26 13:03:25.331385762 +0000
-@@ -184,6 +184,7 @@
+--- konsole.orig/src/main.cpp	2015-05-27 18:02:19.804651972 +0200
++++ konsole/src/main.cpp	2015-05-27 18:02:19.800652134 +0200
+@@ -197,6 +197,7 @@
                        " (for use with -p)"));
      options.add("p <property=value>",
                  ki18nc("@info:shell", "Change the value of a profile property."));
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