[Python-modules-commits] r8816 - in packages/python-qt3/trunk/debian (7 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Thu Jun 18 18:56:03 UTC 2009
Date: Thursday, June 18, 2009 @ 18:55:57
Author: shlomme
Revision: 8816
Prepare for new upstream bug fix release
Modified:
packages/python-qt3/trunk/debian/changelog
packages/python-qt3/trunk/debian/control
packages/python-qt3/trunk/debian/patches/00list
Deleted:
packages/python-qt3/trunk/debian/patches/02_pyobject_typecheck_cast.dpatch
packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch
packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch
packages/python-qt3/trunk/debian/pycompat
Modified: packages/python-qt3/trunk/debian/changelog
===================================================================
--- packages/python-qt3/trunk/debian/changelog 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/changelog 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1,3 +1,18 @@
+python-qt3 (3.18.1-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/02_pyobject_typecheck_cast.dpatch,
+ debian/patches/03_qdomdocument_setcontent.dpatch
+ - Removed, applied upstream
+ * debian/patches/04_qpixmap_loadfromdata.dpatch
+ - Removed, fixed in sip 4.8.1
+ * debian/pycompat
+ - Removed, not needed anymore.
+ * debian/control
+ - Bumped build-dependencies on sip to 4.8.1
+
+ -- Torsten Marek <shlomme at debian.org> Thu, 18 Jun 2009 20:50:37 +0200
+
python-qt3 (3.18-2) unstable; urgency=low
* debian/patches/03_qdomdocument_setcontent.dpatch
Modified: packages/python-qt3/trunk/debian/control
===================================================================
--- packages/python-qt3/trunk/debian/control 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/control 2009-06-18 18:55:57 UTC (rev 8816)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ricardo Javier Cardenes Medina <rcardenes at debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.8), python-sip4-dev (>= 4.8), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), dpatch, python-sip4-dbg, python-all-dbg
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.8.1), python-sip4-dev (>= 4.8.1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), dpatch, python-sip4-dbg, python-all-dbg
Standards-Version: 3.8.1
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt3/trunk/
@@ -11,7 +11,7 @@
Package: python-qt3
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.8), python-sip4 (<= 4.9)
+Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.8.1), python-sip4 (<= 4.9)
Suggests: python-qt3-gl, python-qt3-doc, libqt3-mt-mysql|libqt3-mt-odbc|libqt3-mt-psql
Provides: ${python:Provides}
Description: Qt3 bindings for Python
@@ -28,7 +28,7 @@
Architecture: any
Priority: extra
Section: debug
-Depends: ${shlibs:Depends}, python-dbg, python-qt3 (= ${binary:Version}), python-sip4-dbg (>= 4.8)
+Depends: ${shlibs:Depends}, python-dbg, python-qt3 (= ${binary:Version}), python-sip4-dbg (>= 4.8.1)
Description: Qt3 bindings for Python (debug extension)
Python binding module that allows use of Qt X Window toolkit v3.
You can use it to create portable graphics-capable scripts (there
Modified: packages/python-qt3/trunk/debian/patches/00list
===================================================================
--- packages/python-qt3/trunk/debian/patches/00list 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/patches/00list 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1,4 +1 @@
01_configure
-02_pyobject_typecheck_cast
-03_qdomdocument_setcontent
-04_qpixmap_loadfromdata
Deleted: packages/python-qt3/trunk/debian/patches/02_pyobject_typecheck_cast.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/02_pyobject_typecheck_cast.dpatch 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/patches/02_pyobject_typecheck_cast.dpatch 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_pyobject_typecheck_cast.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: Add cast to PyObject* for Python 2.5
-
- at DPATCH@
-diff -urNad python-qt3-3.18~/sip/qt/qobject.sip python-qt3-3.18/sip/qt/qobject.sip
---- python-qt3-3.18~/sip/qt/qobject.sip 2009-06-05 10:58:25.000000000 +0200
-+++ python-qt3-3.18/sip/qt/qobject.sip 2009-06-09 20:18:36.000000000 +0200
-@@ -1649,7 +1649,7 @@
- // universal slot a child of the transmitter. This doesn't work as
- // expected because QWidget destroys its children before emitting the
- // destroyed signal.)
-- if (tx && PyObject_TypeCheck(tx, (PyTypeObject *)sipClass_QObject))
-+ if (tx && PyObject_TypeCheck((PyObject*)tx, (PyTypeObject *)sipClass_QObject))
- qtx = reinterpret_cast<QObject *>(conn.sc_transmitter);
-
- return new UniversalSlot(qtx, &conn, member);
Deleted: packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1,89 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_qdomdocument_setcontent.dpatch by Phil Thompson
-##
-## DP: Fix QDomDocument.setContent, picked from 3.18.1 snapshots
-
- at DPATCH@
-diff -Naur PyQt-x11-gpl-3.18/sip/qtxml/qdom.sip PyQt-x11-gpl-3.18.1-snapshot-20090610/sip/qtxml/qdom.sip
---- PyQt-x11-gpl-3.18/sip/qtxml/qdom.sip 2009-06-05 10:58:25.000000000 +0200
-+++ PyQt-x11-gpl-3.18.1-snapshot-20090610/sip/qtxml/qdom.sip 2009-06-11 04:30:14.000000000 +0200
-@@ -475,7 +475,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(const QByteArray &,bool);
-@@ -488,7 +489,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(const QString &,bool);
-@@ -501,7 +503,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(QIODevice *,bool);
-@@ -514,7 +517,8 @@
- res = sipCpp -> QDomDocument::setContent(a0,a1,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(const QCString &);
-@@ -527,7 +531,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(const QByteArray &);
-@@ -540,7 +545,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(const QString &);
-@@ -553,7 +559,8 @@
- res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- SIP_PYTUPLE setContent(QIODevice *);
-@@ -566,7 +573,8 @@
- res = sipCpp -> QDomDocument::setContent(a0,emsg,&eline,&ecol);
- Py_END_ALLOW_THREADS
-
-- sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
-+ sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
-+ sipType_QString, (PyObject *)0, eline, ecol);
- %End
-
- %End
Deleted: packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_qpixmap_loadfromdata.dpatch by Torsten Marek <marek at ifi.uzh.ch>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad python-qt3-3.18~/sip/qt/qpixmap.sip python-qt3-3.18/sip/qt/qpixmap.sip
---- python-qt3-3.18~/sip/qt/qpixmap.sip 2009-06-05 10:58:25.000000000 +0200
-+++ python-qt3-3.18/sip/qt/qpixmap.sip 2009-06-11 11:06:05.000000000 +0200
-@@ -245,7 +245,7 @@
- static const char *imageFormat(const QString &);
- bool load(const QString &,const char * = 0,ColorMode = Auto);
- bool load(const QString &,const char *,int);
-- bool loadFromData(const uchar * /Array/,uint /ArraySize/,
-+ bool loadFromData(const uchar * /Array/,Q_ULONG /ArraySize/,
- const char * = 0,ColorMode = Auto);
- // bool loadFromData(const uchar *,uint,const char *,int);
- bool loadFromData(QByteArray,const char * = 0,int = 0);
Deleted: packages/python-qt3/trunk/debian/pycompat
===================================================================
--- packages/python-qt3/trunk/debian/pycompat 2009-06-18 18:34:24 UTC (rev 8815)
+++ packages/python-qt3/trunk/debian/pycompat 2009-06-18 18:55:57 UTC (rev 8816)
@@ -1 +0,0 @@
-2
More information about the Python-modules-commits
mailing list