Bug#637803: pu: package kde4libs/4:4.4.5-2+squeeze3

[Ansgar Burchardt <ansgar@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I would like to include a small patch for kde4libs in the next point
release.  It prevents kate from cutting out text when switching between
documents (this only happens when ibus or possibly another input method
is used).

I talked to Modestas Vainius on IRC and he is fine with this if I take
care of the bureaucratic part (filing this bug).

Regards,
Ansgar

diff -Nru kde4libs-4.4.5/debian/changelog kde4libs-4.4.5/debian/changelog
--- kde4libs-4.4.5/debian/changelog	2011-06-13 23:14:20.000000000 +0200
+++ kde4libs-4.4.5/debian/changelog	2011-08-14 18:34:14.000000000 +0200
@@ -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@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 -Nru kde4libs-4.4.5/debian/patches/636615-ibus.diff kde4libs-4.4.5/debian/patches/636615-ibus.diff
--- kde4libs-4.4.5/debian/patches/636615-ibus.diff	1970-01-01 01:00:00.000000000 +0100
+++ kde4libs-4.4.5/debian/patches/636615-ibus.diff	2011-08-14 18:30:39.000000000 +0200
@@ -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 -Nru kde4libs-4.4.5/debian/patches/series kde4libs-4.4.5/debian/patches/series
--- kde4libs-4.4.5/debian/patches/series	2011-06-13 23:12:37.000000000 +0200
+++ kde4libs-4.4.5/debian/patches/series	2011-08-14 18:30:16.000000000 +0200
@@ -23,3 +23,4 @@
 cve_2011_1094_ssl_verify_hostname.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
+636615-ibus.diff