[Python-modules-commits] r29397 - in packages/python-qt4/trunk/debian (3 files)

[kitterman at users.alioth.debian.org]

    Date: Thursday, June 19, 2014 @ 05:09:30
  Author: kitterman
Revision: 29397

Added debian/patches/fix_implicit_qtablewidget.patch to fixed a pyuic
regression in the handling of implicit QTableWidget dimensions

Added:
  packages/python-qt4/trunk/debian/patches/fix_implicit_qtablewidget.patch
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/series

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2014-06-18 23:01:42 UTC (rev 29396)
+++ packages/python-qt4/trunk/debian/changelog	2014-06-19 05:09:30 UTC (rev 29397)
@@ -1,9 +1,14 @@
-python-qt4 (4.11+dfsg-2) UNRELEASED; urgency=medium
+python-qt4 (4.11+dfsg-2) unstable; urgency=medium
 
+  [ Dmitry Shachnev ]
   * Stop forcing bzip2 compression, it is now deprecated.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 02 Jun 2014 10:28:17 +0400
+  [ Scott Kitterman ]
+  * Added debian/patches/fix_implicit_qtablewidget.patch to fixed a pyuic
+    regression in the handling of implicit QTableWidget dimensions
 
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 18 Jun 2014 23:55:52 -0400
+
 python-qt4 (4.11+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/python-qt4/trunk/debian/patches/fix_implicit_qtablewidget.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_implicit_qtablewidget.patch	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/fix_implicit_qtablewidget.patch	2014-06-19 05:09:30 UTC (rev 29397)
@@ -0,0 +1,22 @@
+Description: Fixed a pyuic regression in the handling of implicit QTableWidget dimensions.
+Author: Phil Thompson <phil at riverbankcomputing.com>
+Origin: upstream
+Forwarded: not-needed
+Reviewed-By: Scott Kitterman <scott at kitterman.com>
+Last-Update: 2014-06-18
+
+--- python-qt4-4.11+dfsg.orig/pyuic/uic/uiparser.py
++++ python-qt4-4.11+dfsg/pyuic/uic/uiparser.py
+@@ -244,10 +244,10 @@ class UIParser(object):
+         self.stack.push(self.setupObject(widget_class, parent, elem))
+ 
+         if isinstance(self.stack.topwidget, QtGui.QTableWidget):
+-            if self.getProperty(elem, 'columnCount') is not None:
++            if self.getProperty(elem, 'columnCount') is None:
+                 self.stack.topwidget.setColumnCount(len(elem.findall("column")))
+ 
+-            if self.getProperty(elem, 'rowCount') is not None:
++            if self.getProperty(elem, 'rowCount') is None:
+                 self.stack.topwidget.setRowCount(len(elem.findall("row")))
+ 
+         self.traverseWidgetTree(elem)

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2014-06-18 23:01:42 UTC (rev 29396)
+++ packages/python-qt4/trunk/debian/patches/series	2014-06-19 05:09:30 UTC (rev 29397)
@@ -2,3 +2,4 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
+fix_implicit_qtablewidget.patch