[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-6-30-g9954e2e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 9954e2ea57ee7b67c3f93c86e753772c000f5923
Author: Modestas Vainius <modax at debian.org>
Date:   Tue May 10 02:05:26 2011 +0300

    Adapt backport_r1209688.diff patch to upstream changes.
---
 debian/changelog                      |    1 +
 debian/patches/backport_r1209688.diff |   18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 548289d..ac6a4fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ kdebindings (4:4.6.3-0r0) UNRELEASED; urgency=low
   * Drop add_qtwebkit_includedir.diff patch, merged upstream.
   * Adapt smokegen_phonon.diff to upstream changes.
   * No longer set -DENABLE_QTMULTIMEDIA_SMOKE=OFF, not needed anymore.
+  * Adapt backport_r1209688.diff patch to upstream changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Aug 2010 22:43:03 +0200
 
diff --git a/debian/patches/backport_r1209688.diff b/debian/patches/backport_r1209688.diff
index b7b9a5c..f42d3c9 100644
--- a/debian/patches/backport_r1209688.diff
+++ b/debian/patches/backport_r1209688.diff
@@ -8,20 +8,18 @@ Make pykdeuic4 work again with PyQt 4.8:
 - change the call to compileUi to account the new from_imports parameter
 
 
-Index: kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py
-===================================================================
---- kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py	(revision 1209687)
-+++ kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py	(revision 1209688)
-@@ -39,7 +39,7 @@
-     def __init__(self,string):
-         original_i18n_string.__init__(self,string)
+--- a/python/pykde4/tools/pykdeuic4/pykdeuic4.py
++++ b/python/pykde4/tools/pykdeuic4/pykdeuic4.py
+@@ -45,7 +45,7 @@ class kde_i18n_string(qtproxies.i18n_str
+     def __init__(self,string, disambig=None):
+         original_i18n_string.__init__(self,string, disambig)
      def __str__(self):
 -        return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),)
 +        return "kdecore.i18n(%s)" % (qtproxies.as_string(self.string),)
+ 
  qtproxies.i18n_string = kde_i18n_string
  
- def kdeFilter():
-@@ -71,7 +71,7 @@
+@@ -78,7 +78,7 @@ def processUI(uifile, output_filename=No
      indenter.indentwidth = indent
      comp = compiler.UICompiler()
      comp.factory._cwFilters.append(kdeFilter())
@@ -30,7 +28,7 @@ Index: kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py
  
      if exe:
          output.write("""
-@@ -104,7 +104,7 @@
+@@ -111,7 +111,7 @@ if __name__ == '__main__':
      app = kdeui.KApplication()
      mainWindow = MainWin(None, "main window")
      mainWindow.show()

-- 
KDE Bindings module packaging