[Python-modules-commits] r3170 - in /packages/python-qt4/trunk/debian: changelog control patches/00list patches/00list.arm patches/00list.armel patches/00list.mips patches/00list.mipsel patches/04_qreal_api_fixes.dpatch rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Mon Sep 3 19:43:33 UTC 2007
Author: shlomme
Date: Mon Sep 3 19:43:33 2007
New Revision: 3170
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3170
Log:
* another attempt to fix the build problems on arm and mips
* added DPMT to uploaders
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/00list
packages/python-qt4/trunk/debian/patches/00list.arm
packages/python-qt4/trunk/debian/patches/00list.armel
packages/python-qt4/trunk/debian/patches/00list.mips
packages/python-qt4/trunk/debian/patches/00list.mipsel
packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/changelog?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/changelog (original)
+++ packages/python-qt4/trunk/debian/changelog Mon Sep 3 19:43:33 2007
@@ -1,3 +1,12 @@
+python-qt4 (4.3-5) unstable; urgency=low
+
+ * Added DPMT to uploaders field.
+ * Changed patch to substitute double by float where needed
+ instead of qreal, because there is a sip bug that prevents
+ a proper fix.
+
+ -- Torsten Marek <shlomme at debian.org> Mon, 03 Sep 2007 21:40:25 +0200
+
python-qt4 (4.3-4) unstable; urgency=low
* Forward CXXFLAGS to the build system (Closes: #438392)
Modified: packages/python-qt4/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/control?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/control (original)
+++ packages/python-qt4/trunk/debian/control Mon Sep 3 19:43:33 2007
@@ -2,6 +2,7 @@
Section: python
Priority: optional
Maintainer: Torsten Marek <shlomme at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0-1), sip4 (>= 4.7-1), python-sip4-dev (>= 4.7-1), python-central (>= 0.5.8), dpatch, python-dbus (>= 0.80.0), libdbus-1-dev (>= 1.0.2)
Standards-Version: 3.7.2
XS-Python-Version: all
Modified: packages/python-qt4/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list (original)
+++ packages/python-qt4/trunk/debian/patches/00list Mon Sep 3 19:43:33 2007
@@ -1,3 +1,2 @@
01_configure
02_htmllinks
-04_qreal_api_fixes
Modified: packages/python-qt4/trunk/debian/patches/00list.arm
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list.arm?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list.arm (original)
+++ packages/python-qt4/trunk/debian/patches/00list.arm Mon Sep 3 19:43:33 2007
@@ -1,1 +1,2 @@
03_qreal
+04_qreal_api_fixes
Modified: packages/python-qt4/trunk/debian/patches/00list.armel
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list.armel?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list.armel (original)
+++ packages/python-qt4/trunk/debian/patches/00list.armel Mon Sep 3 19:43:33 2007
@@ -1,1 +1,2 @@
03_qreal
+04_qreal_api_fixes
Modified: packages/python-qt4/trunk/debian/patches/00list.mips
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list.mips?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list.mips (original)
+++ packages/python-qt4/trunk/debian/patches/00list.mips Mon Sep 3 19:43:33 2007
@@ -1,1 +1,2 @@
03_qreal
+04_qreal_api_fixes
Modified: packages/python-qt4/trunk/debian/patches/00list.mipsel
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/00list.mipsel?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/00list.mipsel (original)
+++ packages/python-qt4/trunk/debian/patches/00list.mipsel Mon Sep 3 19:43:33 2007
@@ -1,1 +1,2 @@
03_qreal
+04_qreal_api_fixes
Modified: packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch (original)
+++ packages/python-qt4/trunk/debian/patches/04_qreal_api_fixes.dpatch Mon Sep 3 19:43:33 2007
@@ -4,40 +4,256 @@
## DP: Exchanges double by qreal in some wrapped methods.
@DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip
+--- python-qt4-4.3~/sip/QtCore/qlist.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qlist.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -322,8 +322,8 @@
+ %End
+ };
+ %If (Qt_4_3_0 -)
+-// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
+-%MappedType QList<QPair<double, double> >
++// QList<QPair<float, float> > is implemented as a Python list of 2-element tuples.
++%MappedType QList<QPair<float, float> >
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -340,7 +340,7 @@
+ // Set the list elements.
+ for (int i = 0; i < sipCpp->size(); ++i)
+ {
+- const QPair<double, double> &p = sipCpp->at(i);
++ const QPair<float, float> &p = sipCpp->at(i);
+ PyObject *pobj;
+
+ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
+@@ -370,16 +370,16 @@
+ return 1;
+ }
+
+- QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
++ QList<QPair<float, float> > *ql = new QList<QPair<float, float> >;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ PyObject *tup = PyList_GET_ITEM(sipPy, i);
+
+- double first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+- double second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
++ float first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
++ float second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
+
+- ql->append(QPair<double, double>(first, second));
++ ql->append(QPair<float, float>(first, second));
+ }
+
+ *sipCppPtr = ql;
+@@ -389,9 +389,9 @@
+ };
+ %End
+ %If (Qt_4_3_0 -)
+-// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
+-template<double, TYPE>
+-%MappedType QList<QPair<double, TYPE> >
++// QList<QPair<float, TYPE> > is implemented as a Python list of 2-element tuples.
++template<float, TYPE>
++%MappedType QList<QPair<float, TYPE> >
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -408,7 +408,7 @@
+ // Set the list elements.
+ for (int i = 0; i < sipCpp->size(); ++i)
+ {
+- const QPair<double, TYPE> &p = sipCpp->at(i);
++ const QPair<float, TYPE> &p = sipCpp->at(i);
+ TYPE *t = new TYPE(p.second);
+ PyObject *pobj;
+
+@@ -447,12 +447,12 @@
+ return 1;
+ }
+
+- QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
++ QList<QPair<float, TYPE> > *ql = new QList<QPair<float, TYPE> >;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ PyObject *tup = PyList_GET_ITEM(sipPy, i);
+- double d;
++ float d;
+ int state;
+
+ d = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+@@ -466,7 +466,7 @@
+ return 0;
+ }
+
+- ql->append(QPair<double, TYPE>(d, *t));
++ ql->append(QPair<float, TYPE>(d, *t));
+
+ sipReleaseInstance(t, sipClass_TYPE, state);
+ }
+@@ -524,8 +524,8 @@
+ return sipGetState(sipTransferObj);
+ %End
+ };
+-// QList<double> is implemented as a Python list of floats.
+-%MappedType QList<double>
++// QList<float> is implemented as a Python list of floats.
++%MappedType QList<float>
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -561,7 +561,7 @@
+ if (sipIsErr == NULL)
+ return PyList_Check(sipPy);
+
+- QList<double> *ql = new QList<double>;
++ QList<float> *ql = new QList<float>;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
+diff -urNad python-qt4-4.3~/sip/QtCore/qvector.sip python-qt4-4.3/sip/QtCore/qvector.sip
+--- python-qt4-4.3~/sip/QtCore/qvector.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qvector.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -143,8 +143,8 @@
+ return sipGetState(sipTransferObj);
+ %End
+ };
+-// QVector<double> is implemented as a Python list of floats.
+-%MappedType QVector<double>
++// QVector<float> is implemented as a Python list of floats.
++%MappedType QVector<float>
+ {
+ %TypeHeaderCode
+ #include <qvector.h>
+@@ -180,7 +180,7 @@
+ if (sipIsErr == NULL)
+ return PyList_Check(sipPy);
+
+- QVector<double> *ql = new QVector<double>;
++ QVector<float> *ql = new QVector<float>;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
+@@ -190,9 +190,9 @@
+ return sipGetState(sipTransferObj);
+ %End
+ };
+-// QVector<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
++// QVector<QPair<float, TYPE> > is implemented as a Python list of 2-element tuples.
+ template<TYPE>
+-%MappedType QVector<QPair<double, TYPE> >
++%MappedType QVector<QPair<float, TYPE> >
+ {
+ %TypeHeaderCode
+ #include <qvector.h>
+@@ -209,7 +209,7 @@
+ // Set the list elements.
+ for (int i = 0; i < sipCpp->size(); ++i)
+ {
+- const QPair<double, TYPE> &p = sipCpp->at(i);
++ const QPair<float, TYPE> &p = sipCpp->at(i);
+ TYPE *pt = new TYPE(p.second);
+ PyObject *pobj;
+
+@@ -248,14 +248,14 @@
+ return 1;
+ }
+
+- QVector<QPair<double, TYPE> > *qv = new QVector<QPair<double, TYPE> >;
++ QVector<QPair<float, TYPE> > *qv = new QVector<QPair<float, TYPE> >;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ PyObject *tup = PyList_GET_ITEM(sipPy, i);
+ int state;
+ TYPE *s;
+- QPair<double, TYPE> p;
++ QPair<float, TYPE> p;
+
+ p.first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+
+diff -urNad python-qt4-4.3~/sip/QtGui/qbrush.sip python-qt4-4.3/sip/QtGui/qbrush.sip
+--- python-qt4-4.3~/sip/QtGui/qbrush.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qbrush.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -138,7 +138,7 @@
+
+ QDataStream &operator>>(QDataStream &, QBrush & /Constrained/);
+ QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/);
+-typedef QVector<QPair<double, QColor> > QGradientStops;
++typedef QVector<QPair<float, QColor> > QGradientStops;
+
+ class QGradient
+ {
+diff -urNad python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip
+--- python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -64,19 +64,19 @@
+
+ public:
+ %If (Qt_4_3_0 -)
+- QList<QPair<double, QPointF> > posList() const;
++ QList<QPair<float, QPointF> > posList() const;
+ %End
+ %If (Qt_4_3_0 -)
+- QList<QPair<double, double> > rotationList() const;
++ QList<QPair<float, float> > rotationList() const;
+ %End
+ %If (Qt_4_3_0 -)
+- QList<QPair<double, QPointF> > translationList() const;
++ QList<QPair<float, QPointF> > translationList() const;
+ %End
+ %If (Qt_4_3_0 -)
+- QList<QPair<double, QPointF> > scaleList() const;
++ QList<QPair<float, QPointF> > scaleList() const;
+ %End
+ %If (Qt_4_3_0 -)
+- QList<QPair<double, QPointF> > shearList() const;
++ QList<QPair<float, QPointF> > shearList() const;
+ %End
+
+ private:
+diff -urNad python-qt4-4.3~/sip/QtGui/qpainterpath.sip python-qt4-4.3/sip/QtGui/qpainterpath.sip
+--- python-qt4-4.3~/sip/QtGui/qpainterpath.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qpainterpath.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -194,8 +194,8 @@
+ void setCurveThreshold(qreal threshold);
+ qreal curveThreshold() const;
+ void setDashPattern(Qt::PenStyle);
+- void setDashPattern(const QVector<double> &dashPattern);
+- QVector<double> dashPattern() const;
++ void setDashPattern(const QVector<float> &dashPattern);
++ QVector<float> dashPattern() const;
+ QPainterPath createStroke(const QPainterPath &path) const;
+ %If (Qt_4_3_0 -)
+ void setDashOffset(qreal offset);
+diff -urNad python-qt4-4.3~/sip/QtGui/qpen.sip python-qt4-4.3/sip/QtGui/qpen.sip
+--- python-qt4-4.3~/sip/QtGui/qpen.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qpen.sip 2007-09-02 00:35:53.000000000 +0200
+@@ -91,8 +91,8 @@
+ void setCapStyle(Qt::PenCapStyle pcs);
+ Qt::PenJoinStyle joinStyle() const;
+ void setJoinStyle(Qt::PenJoinStyle pcs);
+- QVector<double> dashPattern() const;
+- void setDashPattern(const QVector<double> &pattern);
++ QVector<float> dashPattern() const;
++ void setDashPattern(const QVector<float> &pattern);
+ qreal miterLimit() const;
+ void setMiterLimit(qreal limit);
+ bool operator==(const QPen &p) const;
diff -urNad python-qt4-4.3~/sip/QtGui/qtextoption.sip python-qt4-4.3/sip/QtGui/qtextoption.sip
---- python-qt4-4.3~/sip/QtGui/qtextoption.sip 2007-07-30 18:11:44.000000000 +0200
-+++ python-qt4-4.3/sip/QtGui/qtextoption.sip 2007-08-31 21:58:42.000000000 +0200
+--- python-qt4-4.3~/sip/QtGui/qtextoption.sip 2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qtextoption.sip 2007-09-02 00:35:53.000000000 +0200
@@ -62,8 +62,8 @@
typedef QFlags<QTextOption::Flag> Flags;
QFlags<QTextOption::Flag> flags() const;
qreal tabStop() const;
- void setTabArray(QList<double> tabStops);
- QList<double> tabArray() const;
-+ void setTabArray(QList<qreal> tabStops);
-+ QList<qreal> tabArray() const;
++ void setTabArray(QList<float> tabStops);
++ QList<float> tabArray() const;
void setUseDesignMetrics(bool b);
bool useDesignMetrics() const;
void setAlignment(Qt::Alignment aalignment);
-diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip
---- python-qt4-4.3~/sip/QtCore/qlist.sip 2007-07-30 18:11:45.000000000 +0200
-+++ python-qt4-4.3/sip/QtCore/qlist.sip 2007-08-31 22:31:49.000000000 +0200
-@@ -524,8 +524,8 @@
- return sipGetState(sipTransferObj);
- %End
- };
--// QList<double> is implemented as a Python list of floats.
--%MappedType QList<double>
-+// QList<qreal> is implemented as a Python list of floats.
-+%MappedType QList<qreal>
- {
- %TypeHeaderCode
- #include <qlist.h>
-@@ -561,7 +561,7 @@
- if (sipIsErr == NULL)
- return PyList_Check(sipPy);
-
-- QList<double> *ql = new QList<double>;
-+ QList<qreal> *ql = new QList<qreal>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3170&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Mon Sep 3 19:43:33 2007
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+export DH_OPTIONS
include /usr/share/dpatch/dpatch.make
More information about the Python-modules-commits
mailing list