[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#721462: opu: package python-qt4/4.7.3-1+squeeze1



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

See #697348.  This fixes a bug that is causing problems with other software
on squeeze systems.  It's a low risk fix.  It's self-contained and a direct
backport of the upstream change for this issue that's already in wheezy.

Scott K
diff -Nru python-qt4-4.7.3/debian/changelog python-qt4-4.7.3/debian/changelog
--- python-qt4-4.7.3/debian/changelog	2010-04-18 12:11:12.000000000 -0400
+++ python-qt4-4.7.3/debian/changelog	2013-08-31 16:10:18.000000000 -0400
@@ -1,3 +1,11 @@
+python-qt4 (4.7.3-1+squeeze1) oldstable; urgency=low
+
+  * Add debian/patches/loadUI.diff (Closes: #697348)
+    - Code backported from stable (4.9.3) version
+    - Thanks to Jerome Kieffer for pointing out the fix and testing it
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 31 Aug 2013 16:07:06 -0400
+
 python-qt4 (4.7.3-1) unstable; urgency=low
 
   * New upstream release
diff -Nru python-qt4-4.7.3/debian/patches/loadUI.diff python-qt4-4.7.3/debian/patches/loadUI.diff
--- python-qt4-4.7.3/debian/patches/loadUI.diff	1969-12-31 19:00:00.000000000 -0500
+++ python-qt4-4.7.3/debian/patches/loadUI.diff	2013-08-31 16:13:44.000000000 -0400
@@ -0,0 +1,21 @@
+Backported from 4.9.3, Closes ##697348
+Index: python-qt4-4.7.3/pyuic/uic/uiparser.py
+===================================================================
+--- python-qt4-4.7.3.orig/pyuic/uic/uiparser.py	2010-04-16 06:32:09.000000000 -0400
++++ python-qt4-4.7.3/pyuic/uic/uiparser.py	2013-08-31 16:13:08.538679027 -0400
+@@ -181,7 +181,14 @@
+         elif isinstance(widget, QtGui.QAbstractButton):
+             bg_i18n = self.wprops.getAttribute(elem, "buttonGroup")
+             if bg_i18n is not None:
+-                bg_name = bg_i18n.string
++                # This should be handled properly in case the problem arises
++                # elsewhere as well.
++                try:
++                    # We are compiling the .ui file.
++                    bg_name = bg_i18n.string
++                except AttributeError:
++                    # We are loading the .ui file.
++                    bg_name = bg_i18n
+ 
+                 for bg in self.button_groups:
+                     if bg.objectName() == bg_name:
diff -Nru python-qt4-4.7.3/debian/patches/series python-qt4-4.7.3/debian/patches/series
--- python-qt4-4.7.3/debian/patches/series	2010-03-25 18:55:39.000000000 -0400
+++ python-qt4-4.7.3/debian/patches/series	2013-08-31 16:10:30.000000000 -0400
@@ -1,2 +1,3 @@
 qreal_float_support.diff
 debian_configure_changes.diff
+loadUI.diff

Reply to: