[Python-modules-commits] r22729 - in packages/python-qt4/trunk/debian (7 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Mon Oct 1 22:51:58 UTC 2012
Date: Monday, October 1, 2012 @ 22:51:56
Author: kitterman
Revision: 22729
* New upstream release
- Bump minimum python-sip-dev and python3-sip-dev versions to 4.14
- Drop debian/patches/pyuic_custom_widget.diff (it was a cherrypick from
upstream and is included in this version)
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/watch
Deleted:
packages/python-qt4/trunk/debian/patches/pyuic_custom_widget.diff
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/changelog 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,3 +1,12 @@
+python-qt4 (4.9.5-1) experimental; urgency=low
+
+ * New upstream release
+ - Bump minimum python-sip-dev and python3-sip-dev versions to 4.14
+ - Drop debian/patches/pyuic_custom_widget.diff (it was a cherrypick from
+ upstream and is included in this version)
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 01 Oct 2012 16:10:40 -0400
+
python-qt4 (4.9.3-4) unstable; urgency=low
* Add -N pyqt4-dev-tools to the dh_python3 invocation so dh_pyton3 will
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/control 2012-10-01 22:51:56 UTC (rev 22729)
@@ -25,9 +25,9 @@
python3-dbus-dbg,
python-dbus-dev,
python-sip-dbg,
- python-sip-dev (>= 4.13.3-2~),
+ python-sip-dev (>= 4.14),
python3-sip-dbg,
- python3-sip-dev (>= 4.13.3-2~),
+ python3-sip-dev (>= 4.14),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.9.3
Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.9.3/configure.py
+Index: python-qt4-4.9.5/configure.py
===================================================================
---- python-qt4-4.9.3.orig/configure.py 2012-06-24 12:08:05.388125143 -0400
-+++ python-qt4-4.9.3/configure.py 2012-06-24 12:08:08.788125044 -0400
-@@ -876,31 +876,6 @@
+--- python-qt4-4.9.5.orig/configure.py 2012-10-01 17:16:26.757130858 -0400
++++ python-qt4-4.9.5/configure.py 2012-10-01 17:17:21.917129227 -0400
+@@ -898,31 +898,6 @@
makefile.generate()
tool.append("dbus")
@@ -34,7 +34,7 @@
# The pyuic directory may not exist if we are building away from the
# source directory.
try:
-@@ -909,7 +884,6 @@
+@@ -931,7 +906,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -918,7 +892,6 @@
+@@ -940,7 +914,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Deleted: packages/python-qt4/trunk/debian/patches/pyuic_custom_widget.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/pyuic_custom_widget.diff 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/patches/pyuic_custom_widget.diff 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,94 +0,0 @@
-Description: Fixes a regression in pyuic's handling of custom widgets.
-Regression between PyQt4 4.9.1 and 4.9.3 which caused widgets not to be found
-and caused other packages to FTBFS. Patch author is the upstream developer
-and the fix will be part of the next upstream release (4.9.5).
-Author: Phil Thompson <phil at riverbankcomputing.com>
-Bug-Debian: http://bugs.debian.org/680837
-Origin: <upstream>
-Forwarded: <not-needed>
-Reviewed-By: Scott Kitterman <scott at kitterman.com>
-Last-Update: <2012-07-15>
-
---- python-qt4-4.9.3.orig/pyuic/uic/objcreator.py
-+++ python-qt4-4.9.3/pyuic/uic/objcreator.py
-@@ -102,19 +102,26 @@ class QObjectCreator(object):
- self._modules.append(self._customWidgets)
-
- def createQObject(self, classname, *args, **kwargs):
-- # Handle scoped names, typically static factory methods.
-- parts = classname.split('.')
-- factory = self.findQObjectType(parts[0])
--
-- if factory is not None:
-- for part in parts[1:]:
-- factory = getattr(factory, part, None)
-- if factory is None:
-- break
-- else:
-- return self._cpolicy.instantiate(factory, *args, **kwargs)
-+ # Handle regular and custom widgets.
-+ factory = self.findQObjectType(classname)
-
-- raise NoSuchWidgetError(classname)
-+ if factory is None:
-+ # Handle scoped names, typically static factory methods.
-+ parts = classname.split('.')
-+
-+ if len(parts) > 1:
-+ factory = self.findQObjectType(parts[0])
-+
-+ if factory is not None:
-+ for part in parts[1:]:
-+ factory = getattr(factory, part, None)
-+ if factory is None:
-+ break
-+
-+ if factory is None:
-+ raise NoSuchWidgetError(classname)
-+
-+ return self._cpolicy.instantiate(factory, *args, **kwargs)
-
- def invoke(self, rname, method, args=()):
- return self._cpolicy.invoke(rname, method, args)
---- python-qt4-4.9.3.orig/pyuic/uic/Compiler/qobjectcreator.py
-+++ python-qt4-4.9.3/pyuic/uic/Compiler/qobjectcreator.py
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@ class _CustomWidgetLoader(object):
- assert widgetClass not in self._widgets
- self._widgets[widgetClass] = (baseClass, module)
-
--
- def _resolveBaseclass(self, baseClass):
- try:
- for x in range(0, 10):
-@@ -114,19 +113,17 @@ class _CustomWidgetLoader(object):
- except KeyError:
- raise ValueError("unknown baseclass %s" % baseClass)
-
--
- def search(self, cls):
- try:
-- self._usedWidgets.add(cls)
- baseClass = self._resolveBaseclass(self._widgets[cls][0])
- DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--
-- return type(cls, (baseClass,),
-- {"module" : ""})
--
- except KeyError:
- return None
-
-+ self._usedWidgets.add(cls)
-+
-+ return type(cls, (baseClass, ), {"module" : ""})
-+
- def _writeImportCode(self):
- imports = {}
- for widget in self._usedWidgets:
Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,9 +1,9 @@
## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.9.3/configure.py
+Index: python-qt4-4.9.5/configure.py
===================================================================
---- python-qt4-4.9.3.orig/configure.py 2012-06-24 12:11:01.272119947 -0400
-+++ python-qt4-4.9.3/configure.py 2012-06-24 12:11:04.236119859 -0400
-@@ -2114,8 +2114,9 @@
+--- python-qt4-4.9.5.orig/configure.py 2012-09-29 07:34:33.000000000 -0400
++++ python-qt4-4.9.5/configure.py 2012-10-01 17:16:26.757130858 -0400
+@@ -2157,8 +2157,9 @@
out << "PyQt_NoOpenGLES\\n";
#endif
@@ -14,10 +14,10 @@
return 0;
}
-Index: python-qt4-4.9.3/sip/QtCore/qlist.sip
+Index: python-qt4-4.9.5/sip/QtCore/qlist.sip
===================================================================
---- python-qt4-4.9.3.orig/sip/QtCore/qlist.sip 2012-06-24 12:11:01.280119947 -0400
-+++ python-qt4-4.9.3/sip/QtCore/qlist.sip 2012-06-24 12:11:04.240119860 -0400
+--- python-qt4-4.9.5.orig/sip/QtCore/qlist.sip 2012-09-29 07:35:01.000000000 -0400
++++ python-qt4-4.9.5/sip/QtCore/qlist.sip 2012-10-01 17:16:26.761130858 -0400
@@ -807,3 +807,227 @@
return sipGetState(sipTransferObj);
%End
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/patches/series 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,3 +1,2 @@
qreal_float_support.diff
debian_configure_changes.diff
-pyuic_custom_widget.diff
Modified: packages/python-qt4/trunk/debian/watch
===================================================================
--- packages/python-qt4/trunk/debian/watch 2012-10-01 08:57:33 UTC (rev 22728)
+++ packages/python-qt4/trunk/debian/watch 2012-10-01 22:51:56 UTC (rev 22729)
@@ -1,4 +1,2 @@
version=3
-#http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-(.*)\.tar\.gz debian uupdate
-http://www.riverbankcomputing.co.uk/software/pyqt/download \
- /static/Downloads/PyQt4/PyQt-x11-gpl-([\d\.]*)\.tar\.gz debian uupdate
+http://sf.net/pyqt/PyQt-x11-gpl-(.*)\.tar\.gz debian uupdate
More information about the Python-modules-commits
mailing list