[Python-modules-commits] r20420 - in packages/python-qt4/trunk/debian (10 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sun Feb 12 21:39:52 UTC 2012
Date: Sunday, February 12, 2012 @ 21:39:50
Author: kitterman
Revision: 20420
* Drop experimental options (multiarch qt4-x11 path and python3-pyqt4-dbus)
for upload to unstable
* New upstream release
- Drop debian/patches/py3-fixes.patch, upstream fixed the problem in a
slightly different way
- Drop debian/patches/kubuntu_arm_fix.diff, fixed upstream
* Install NEWS file as upstream changelog since that is what it is
* Rebuild sphinx based html docs from rst files
- Add python-sphinx (>= 1.0.7+dfsg-1~) to build-depends
- Add sphinxdoc:Depends to python-qt4-doc depends
- Add call to sphinx-build and dh_sphinxdoc for arch all packages
* Drop build-depends on qtmobility-dev, pointless right now since the build
system can not find its headers
* Add missing build-depends on qtmobility-dev and libicu-dev
* Build python3-pyqt4-dbus/-dbg packages now that python3 port of dbus-python
is availalble
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/python-qt4.install
packages/python-qt4/trunk/debian/rules
Deleted:
packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff
packages/python-qt4/trunk/debian/patches/py3-fixes.patch
packages/python-qt4/trunk/debian/python3-dbus.mainloop.qt.install
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/changelog 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1,3 +1,21 @@
+python-qt4 (4.9.1-1) unstable; urgency=low
+
+ * Drop experimental options (multiarch qt4-x11 path and python3-pyqt4-dbus)
+ for upload to unstable
+ * New upstream release
+ - Drop debian/patches/py3-fixes.patch, upstream fixed the problem in a
+ slightly different way
+ - Drop debian/patches/kubuntu_arm_fix.diff, fixed upstream
+ * Install NEWS file as upstream changelog since that is what it is
+ * Rebuild sphinx based html docs from rst files
+ - Add python-sphinx (>= 1.0.7+dfsg-1~) to build-depends
+ - Add sphinxdoc:Depends to python-qt4-doc depends
+ - Add call to sphinx-build and dh_sphinxdoc for arch all packages
+ * Drop build-depends on qtmobility-dev, pointless right now since the build
+ system can not find its headers
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 12 Feb 2012 11:27:51 -0500
+
python-qt4 (4.9-3) experimental; urgency=low
[ Scott Kitterman ]
@@ -2,4 +20,3 @@
* Add myself to uploaders
- * Add missing build-depends on python-dbus-dev, qtmobility-dev and
- libicu-dev
+ * Add missing build-depends on qtmobility-dev and libicu-dev
* Feedback changes from Ubuntu
@@ -10,8 +27,8 @@
* Use dh_sip3 for generating SIP depends instead of hard coded version now
that dh_sip3 is available
- Add dh_sip3 in debian/rules
- * Build python3-dbus.mainloop.qt/-dbg packages now that python3 port of
- dbus-python is availalble
+ * Build python3-pyqt4-dbus/-dbg packages now that python3 port of dbus-python
+ is availalble
- Add packages to debian/control
- Add python3-dbus and python3-dbus-dbg to build-depends
- Adjust debian/rules to support python-pyqt4-dbus-dbg
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/control 2012-02-12 21:39:50 UTC (rev 20420)
@@ -10,24 +10,21 @@
libicu-dev,
libdbus-1-dev (>= 1.0.2),
libphonon-dev (>= 4:4.2.0-2),
- libqt4-dev (>= 4:4.8.0-1~),
+ libqt4-dev (>= 4:4.7.0),
libqt4-opengl-dev,
libqtassistantclient-dev,
libqtwebkit-dev,
- qtmobility-dev,
python-all-dbg,
python-all-dev (>= 2.6.6-3~),
python3-all-dbg,
python3-all-dev,
- python-dbus-dev,
python-dbus (>= 0.84.0-2),
python-dbus-dbg,
- python3-dbus,
- python3-dbus-dbg,
python-sip-dbg,
python-sip-dev (>= 4.13.1),
python3-sip-dbg,
- python3-sip-dev (>= 4.13.1-3~)
+ python3-sip-dev (>= 4.13.1-3~),
+ python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.9.2
X-Python-Version: >= 2.4
@@ -201,33 +198,33 @@
.
This package contains the extensions built for the Python debug interpreter.
-Package: python3-dbus.mainloop.qt
-Architecture: any
-Provides: ${python3:Provides}
-Depends: python3-dbus,
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
-Description: DBus Support for PyQt4 with Python 3
- The DBus module of PyQt4 provides integration of PyQt4 applications
- with the DBus main loop for Python 3
-
-Package: python3-dbus.mainloop.qt-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Provides: ${python3:Provides}
-Depends: python3-dbg,
- python3-dbus-dbg,
- python3-dbus.mainloop.qt (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Description: DBus Support for PyQt4 (debug extensions for Python 3)
- The DBus module of PyQt4 provides integration of PyQt4 applications
- with the DBus main loop for Python 3
- .
- This package contains the extensions built for the Python debug interpreter.
-
+#Package: python3-pyqt4-dbus
+#Architecture: any
+#Provides: ${python3:Provides}
+#Depends: python3-dbus,
+# ${misc:Depends},
+# ${python3:Depends},
+# ${shlibs:Depends}
+#Description: DBus Support for PyQt4 with Python 3
+# The DBus module of PyQt4 provides integration of PyQt4 applications
+# with the DBus main loop for Python 3
+#
+#Package: python3-pyqt4-dbus-dbg
+#Architecture: any
+#Priority: extra
+#Section: debug
+#Provides: ${python3:Provides}
+#Depends: python3-dbg,
+# python3-dbus-dbg,
+# python3-pyqt4-dbus (= ${binary:Version}),
+# ${misc:Depends},
+# ${shlibs:Depends}
+#Description: DBus Support for PyQt4 (debug extensions for Python 3)
+# The DBus module of PyQt4 provides integration of PyQt4 applications
+# with the DBus main loop for Python 3
+# .
+# This package contains the extensions built for the Python debug interpreter.
+#
Package: python-qt4-gl
Architecture: any
Provides: ${python:Provides}
@@ -345,7 +342,7 @@
Architecture: all
Section: doc
Suggests: qt4-doc
-Depends: libjs-jquery, ${misc:Depends}
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
Description: Documentation and examples for PyQt4
PyQt4 exposes the Qt4 GUI toolkit in Python.
.
Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.9/configure.py
+Index: python-qt4-4.9.1/configure.py
===================================================================
---- python-qt4-4.9.orig/configure.py 2011-12-28 14:01:13.755143235 -0500
-+++ python-qt4-4.9/configure.py 2011-12-28 14:01:23.211142955 -0500
-@@ -873,31 +873,6 @@
+--- python-qt4-4.9.1.orig/configure.py 2012-02-11 17:02:46.626548495 -0500
++++ python-qt4-4.9.1/configure.py 2012-02-11 21:58:02.088063515 -0500
+@@ -870,31 +870,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:
-@@ -906,7 +881,6 @@
+@@ -903,7 +878,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -915,7 +889,6 @@
+@@ -912,7 +886,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Deleted: packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1,17 +0,0 @@
-Index: python-qt4-4.9/sip/QtGui/qpainterpath.sip
-===================================================================
---- python-qt4-4.9.orig/sip/QtGui/qpainterpath.sip 2012-01-27 12:05:21.768137253 +0000
-+++ python-qt4-4.9/sip/QtGui/qpainterpath.sip 2012-01-27 12:05:44.448137444 +0000
-@@ -265,10 +265,10 @@
- QVector<qreal> dashPattern() const;
- %End
- %If (Qt_4_8_0 -)
-- void setDashPattern(const QVector<double> &dashPattern);
-+ void setDashPattern(const QVector<qreal> &dashPattern);
- %End
- %If (Qt_4_8_0 -)
-- QVector<double> dashPattern() const;
-+ QVector<qreal> dashPattern() const;
- %End
-
- private:
Deleted: packages/python-qt4/trunk/debian/patches/py3-fixes.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/py3-fixes.patch 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/patches/py3-fixes.patch 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1,57 +0,0 @@
---- a/dbus/dbus.cpp
-+++ b/dbus/dbus.cpp
-@@ -392,7 +392,30 @@
-
-
- // The module entry point.
--PyMODINIT_FUNC initqt()
-+PyMODINIT_FUNC
-+#if PY_MAJOR_VERSION >= 3
-+PyInit_qt(void)
-+{
-+ // Import the generic part of the Python DBus bindings.
-+ if (import_dbus_bindings("dbus.mainloop.qt") < 0)
-+ return NULL;
-+
-+ static struct PyModuleDef moduledef = {
-+ PyModuleDef_HEAD_INIT,
-+ "qt", // m_name
-+ NULL, // m_doc
-+ -1, // m_size
-+ module_functions, // m_methods
-+ NULL, // m_reload
-+ NULL, // m_traverse
-+ NULL, // m_clear
-+ NULL // m_free
-+ };
-+
-+ return PyModule_Create(&moduledef);
-+};
-+#else
-+initqt()
- {
- // Import the generic part of the Python DBus bindings.
- if (import_dbus_bindings("dbus.mainloop.qt") < 0)
-@@ -400,3 +423,4 @@
-
- Py_InitModule("qt", module_functions);
- }
-+#endif
---- a/configure.py
-+++ b/configure.py
-@@ -1351,8 +1351,14 @@
- sipconfig.inform("DBus v1 does not seem to be installed.")
- return
-
-+ # Always operate on unicode string objects.
-+ if isinstance(iflags, bytes):
-+ # Assume ASCII, since on the buildds, that's the default file system
-+ # encoding, not utf-8.
-+ iflags = iflags.decode('ascii')
-+
- # Using str() means it will work with both Python v2 and v3.
-- for f in str(iflags).split():
-+ for f in iflags.split():
- if f.startswith("-I"):
- dbusincdirs.append(f[2:])
- elif f.startswith("-L"):
Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1,9 +1,9 @@
## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.9/configure.py
+Index: python-qt4-4.9.1/configure.py
===================================================================
---- python-qt4-4.9.orig/configure.py 2011-12-28 14:01:08.503143391 -0500
-+++ python-qt4-4.9/configure.py 2011-12-28 14:01:13.755143235 -0500
-@@ -2073,8 +2073,9 @@
+--- python-qt4-4.9.1.orig/configure.py 2012-02-11 16:59:33.402554204 -0500
++++ python-qt4-4.9.1/configure.py 2012-02-11 17:02:46.626548495 -0500
+@@ -2072,8 +2072,9 @@
out << "PyQt_NoOpenGLES\\n";
#endif
@@ -14,10 +14,10 @@
return 0;
}
-Index: python-qt4-4.9/sip/QtCore/qlist.sip
+Index: python-qt4-4.9.1/sip/QtCore/qlist.sip
===================================================================
---- python-qt4-4.9.orig/sip/QtCore/qlist.sip 2011-12-28 14:01:08.515143389 -0500
-+++ python-qt4-4.9/sip/QtCore/qlist.sip 2011-12-28 14:01:13.759143234 -0500
+--- python-qt4-4.9.1.orig/sip/QtCore/qlist.sip 2012-02-11 16:59:33.422554203 -0500
++++ python-qt4-4.9.1/sip/QtCore/qlist.sip 2012-02-11 17:05:31.546543622 -0500
@@ -807,3 +807,227 @@
return sipGetState(sipTransferObj);
%End
@@ -86,19 +86,19 @@
+
+ QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
+ len = PySequence_Size(sipPy);
-+
++
+ for (SIP_SSIZE_T i = 0; i < len; ++i)
+ {
+ PyObject *tup = PySequence_ITEM(sipPy, i);
+
+ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
+ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
-+
++
+ ql->append(QPair<double, double>(first, second));
+ }
-+
++
+ *sipCppPtr = ql;
-+
++
+ return sipGetState(sipTransferObj);
+%End
+};
@@ -166,7 +166,7 @@
+
+ QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
+ len = PySequence_Size(sipPy);
-+
++
+ for (SIP_SSIZE_T i = 0; i < len; ++i)
+ {
+ PyObject *tup = PySequence_ITEM(sipPy, i);
@@ -175,7 +175,7 @@
+
+ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
+ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
++
+ if (*sipIsErr)
+ {
+ sipReleaseInstance(t, sipClass_TYPE, state);
@@ -188,9 +188,9 @@
+
+ sipReleaseInstance(t, sipClass_TYPE, state);
+ }
-+
++
+ *sipCppPtr = ql;
-+
++
+ return sipGetState(sipTransferObj);
+%End
+};
@@ -235,12 +235,12 @@
+
+ QList<double> *ql = new QList<double>;
+ SIP_SSIZE_T len = PySequence_Size(sipPy);
-+
++
+ for (SIP_SSIZE_T i = 0; i < len; ++i)
+ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
-+
++
+ *sipCppPtr = ql;
-+
++
+ return sipGetState(sipTransferObj);
+%End
+};
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/patches/series 2012-02-12 21:39:50 UTC (rev 20420)
@@ -2,5 +2,3 @@
debian_configure_changes.diff
fix_qthelp_ftbfs.diff
fix_the_QAssitant_ftbfs.diff
-py3-fixes.patch
-kubuntu_arm_fix.diff
Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/python-qt4.install 2012-02-12 21:39:50 UTC (rev 20420)
@@ -17,4 +17,4 @@
usr/lib/python2*/*-packages/PyQt4/__init__.py
usr/lib/python2*/*-packages/PyQt4/pyqtconfig.py
usr/lib/python2*/*-packages/PyQt4/uic/*
-usr/lib/*/qt4/*
+usr/lib/qt4/*
Deleted: packages/python-qt4/trunk/debian/python3-dbus.mainloop.qt.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-dbus.mainloop.qt.install 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/python3-dbus.mainloop.qt.install 2012-02-12 21:39:50 UTC (rev 20420)
@@ -1 +0,0 @@
-/usr/lib/python3/dist-packages/dbus/mainloop/*
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2012-02-12 18:53:17 UTC (rev 20419)
+++ packages/python-qt4/trunk/debian/rules 2012-02-12 21:39:50 UTC (rev 20420)
@@ -13,7 +13,7 @@
endif
py_dbusmoddir = $(shell python$(1) -c 'import dbus.mainloop; print dbus.mainloop.__path__[0]')
-py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+#py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
export QMAKESPEC=linux-g++
@@ -105,7 +105,7 @@
dh_installdirs -a
sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
rm -f $(CURDIR)/debian/python-qt4-dbus.install
- rm -f $(CURDIR)/debian/python3-dbus.mainloop.qt.install
+ rm -f $(CURDIR)/debian/python3-pyqt4-dbus.install
# This is needed to enforce that the install-arch-% rules are
# not run in parallel. Both rules install into the same directory,
# and therefore might try to access the same files at the same time.
@@ -131,7 +131,7 @@
# probably like ipython handles it.
cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
-d3_qt4_dbg = debian/python3-dbus.mainloop.qt-dbg
+d3_qt4_dbg = debian/python3-pyqt4-dbg
install-arch-3.%:
$(MAKE) -C build-3.$* install \
@@ -154,12 +154,12 @@
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
- if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
- mkdir -p debian/python3-pyqt4-dbus-dbg/$(call py3_dbusmoddir,$*);\
- mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
- debian/python3-pyqt4-dbus-dbg$(call py3_dbusmoddir,$*);\
- echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
- fi
+# if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
+# mkdir -p debian/python3-pyqt4-dbus-dbg/$(call py3_dbusmoddir,$*);\
+# mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
+# debian/python3-pyqt4-dbus-dbg$(call py3_dbusmoddir,$*);\
+# echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-pyqt4-dbus.install;\
+# fi
d_qt4_dbg = debian/python-qt4-dbg
@@ -206,8 +206,13 @@
dh_testdir
dh_testroot
dh_installman
- dh_installchangelogs
- dh_installdocs -A NEWS THANKS
+ dh_installchangelogs NEWS
+ dh_installdocs -A THANKS
+ifeq (,$(findstring -a, $(DH_OPTIONS)))
+ sphinx-build $(CURDIR)/doc/sphinx \
+ $(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/html
+ dh_sphinxdoc
+endif
dh_link
dh_sip
dh_sip3
@@ -215,7 +220,7 @@
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
set -e; \
for p in python-qt4 python3-pyqt4 \
- python-qt4-dbus python3-dbus.mainloop.qt \
+ python-qt4-dbus \
python-qt4-gl \
python-qt4-sql python3-pyqt4.qtsql \
python-qt4-phonon python3-pyqt4.phonon \
@@ -236,9 +241,7 @@
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/bin
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/PyQt4/uic
- rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop
- rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/python3/dist-packages
- rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/share/sip
+ rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop/
dh_fixperms
dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
dh_installdeb
More information about the Python-modules-commits
mailing list