[SCM] konsole packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-34-g86c8234
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Mon Mar 2 12:52:37 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=86c8234
The following commit has been merged in the kubuntu_unstable branch:
commit 86c8234e0ec5951079f24a278e658cfd1b75363f
Author: Jonathan Riddell <jr at jriddell.org>
Date: Mon Mar 2 13:51:45 2015 +0100
Add upstream_control-space.diff to fix emacs use
---
debian/changelog | 6 ++++++
debian/patches/series | 1 +
debian/patches/upstream_control-space.diff | 33 ++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ab7bc80..d1faf6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+konsole (4:14.12.2-0ubuntu2) vivid; urgency=medium
+
+ * Add upstream_control-space.diff to fix emacs use
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 02 Mar 2015 13:43:47 +0100
+
konsole (4:14.12.2-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index bccb940..24ad6f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian-T-addition.diff
+upstream_control-space.diff
diff --git a/debian/patches/upstream_control-space.diff b/debian/patches/upstream_control-space.diff
new file mode 100644
index 0000000..9bcf539
--- /dev/null
+++ b/debian/patches/upstream_control-space.diff
@@ -0,0 +1,33 @@
+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
More information about the pkg-kde-commits
mailing list