[SCM] KDE Development Platform Libraries module packaging branch, squeeze, updated. debian/4.4.5-2+squeeze3

[Modestas Vainius]

The following commit has been merged in the squeeze branch:
commit 2e7b0f50033e43e9a9cd63b437b99133d44e3c31
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Sep 4 10:18:32 2011 +0300

    Import stable upload (#637803).
    
    Thanks to Ansgar Burchardt for preparing it.
    
    ----
    Apply upstream patch to prevent marked text being cut out when switching
    documents in kate. (Closes: #636615)
      + new patch: 636615-ibus.diff
    ----
---
 debian/changelog                |    8 ++++++++
 debian/patches/636615-ibus.diff |   25 +++++++++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00d29d8..162d93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kde4libs (4:4.4.5-2+squeeze3) stable; urgency=low
+
+  * Apply upstream patch to prevent marked text being cut out when switching
+    documents in kate. (Closes: #636615)
+    + new patch: 636615-ibus.diff
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Sun, 14 Aug 2011 18:32:12 +0200
+
 kde4libs (4:4.4.5-2+squeeze2) stable; urgency=low
 
   [ José Manuel Santamaría Lema ]
diff --git a/debian/patches/636615-ibus.diff b/debian/patches/636615-ibus.diff
new file mode 100644
index 0000000..85947a5
--- /dev/null
+++ b/debian/patches/636615-ibus.diff
@@ -0,0 +1,25 @@
+Bug: https://bugs.kde.org/show_bug.cgi?id=248558
+Bug-Debian: http://bugs.debian.org/636615
+Origin: backport, http://websvn.kde.org/branches/KDE/4.5/kdelibs/kate/view/kateviewinternal.cpp?r1=1199457&r2=1199456&pathrev=1199457&view=patch
+
+--- kde4libs-4.4.5.orig/kate/view/kateviewinternal.cpp
++++ kde4libs-4.4.5/kate/view/kateviewinternal.cpp
+@@ -3781,9 +3781,6 @@
+ 
+   //kDebug( 13030 ) << "Event: cursor" << m_cursor << "commit" << e->commitString() << "preedit" << e->preeditString() << "replacement start" << e->replacementStart() << "length" << e->replacementLength();
+ 
+-  if ( m_view->selection() )
+-    m_view->removeSelectedText();
+-
+   bool createdPreedit = false;
+   if (!m_imPreeditRange) {
+     createdPreedit = true;
+@@ -3797,6 +3794,8 @@
+   }
+ 
+   if (!e->commitString().isEmpty() || e->replacementLength()) {
++    m_view->removeSelectedText();
++
+     KTextEditor::Range preeditRange = *m_imPreeditRange;
+ 
+     KTextEditor::Cursor start(m_imPreeditRange->start().line(), m_imPreeditRange->start().column() + e->replacementStart());
diff --git a/debian/patches/series b/debian/patches/series
index 487a3b0..4aafd60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ cve_2010_3170_cn_wildcards.diff
 cve_2011_1094_ssl_verify_hostname.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
+636615-ibus.diff

-- 
KDE Development Platform Libraries module packaging