[Python-modules-commits] r20154 - in packages/python-qt4/trunk/debian (7 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Fri Jan 27 17:21:52 UTC 2012
Date: Friday, January 27, 2012 @ 17:21:50
Author: kitterman
Revision: 20154
* Prep for upload to experimental.
[ Scott Kitterman ]
* Add myself to uploaders
* Feedback changes from Ubuntu
* Adjust install path in debian/python-qt4.install for multiarched qt4-x11
and bump minimum build-dep version to 4:4.8.0-1~
* 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 python-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
- Provide path to dbus-python.h using --dbus option in configure since in
Python 3, the build system can't find it
[ Barry Warsaw ]
* Port dbus/dbus.cpp to work with Python3 as well and add as
debian/patches/py3-fixes.patch
[ Jonathan Riddell ]
* Add kubuntu_arm_fix.diff to fix qpainterpath.sip use of 'double'
which causes ARM to fail to build with Qt 4.8
Added:
packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff
packages/python-qt4/trunk/debian/patches/py3-fixes.patch
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/python-qt4.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2012-01-27 10:30:00 UTC (rev 20153)
+++ packages/python-qt4/trunk/debian/changelog 2012-01-27 17:21:50 UTC (rev 20154)
@@ -1,3 +1,31 @@
+python-qt4 (4.9-3) experimental; urgency=low
+
+ [ Scott Kitterman ]
+ * Add myself to uploaders
+ * Feedback changes from Ubuntu
+ * Adjust install path in debian/python-qt4.install for multiarched qt4-x11
+ and bump minimum build-dep version to 4:4.8.0-1~
+ * 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 python-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
+ - Provide path to dbus-python.h using --dbus option in configure since in
+ Python 3, the build system can't find it
+
+ [ Barry Warsaw ]
+ * Port dbus/dbus.cpp to work with Python3 as well and add as
+ debian/patches/py3-fixes.patch
+
+ [ Jonathan Riddell ]
+ * Add kubuntu_arm_fix.diff to fix qpainterpath.sip use of 'double'
+ which causes ARM to fail to build with Qt 4.8
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 27 Jan 2012 12:15:01 -0500
+
python-qt4 (4.9-2) unstable; urgency=low
* Team upload
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-01-27 10:30:00 UTC (rev 20153)
+++ packages/python-qt4/trunk/debian/control 2012-01-27 17:21:50 UTC (rev 20154)
@@ -4,11 +4,12 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>,
Michael Casadevall <mcasadevall at debian.org>,
- Bernd Zeimetz <bzed at debian.org>
+ Bernd Zeimetz <bzed at debian.org>,
+ Scott Kitterman <scott at kitterman.com>
Build-Depends: debhelper (>= 7),
libdbus-1-dev (>= 1.0.2),
libphonon-dev (>= 4:4.2.0-2),
- libqt4-dev (>= 4:4.7.0),
+ libqt4-dev (>= 4:4.8.0-1~),
libqt4-opengl-dev,
libqtassistantclient-dev,
libqtwebkit-dev,
@@ -18,10 +19,12 @@
python3-all-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)
+ python3-sip-dev (>= 4.13.1-3~)
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.9.2
X-Python-Version: >= 2.4
@@ -66,7 +69,7 @@
Package: python3-pyqt4
Architecture: any
Provides: ${python3:Provides}
-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}, python3-sip (>= 4.13.1~)
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}
Suggests: python3-pyqt4-dbg
Breaks: python3-sip (<< 4.13.1~)
Description: Python3 bindings for Qt4
@@ -195,6 +198,33 @@
.
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}
Added: packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff (rev 0)
+++ packages/python-qt4/trunk/debian/patches/kubuntu_arm_fix.diff 2012-01-27 17:21:50 UTC (rev 20154)
@@ -0,0 +1,17 @@
+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:
Added: packages/python-qt4/trunk/debian/patches/py3-fixes.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/py3-fixes.patch (rev 0)
+++ packages/python-qt4/trunk/debian/patches/py3-fixes.patch 2012-01-27 17:21:50 UTC (rev 20154)
@@ -0,0 +1,57 @@
+--- 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/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2012-01-27 10:30:00 UTC (rev 20153)
+++ packages/python-qt4/trunk/debian/patches/series 2012-01-27 17:21:50 UTC (rev 20154)
@@ -2,3 +2,5 @@
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-01-27 10:30:00 UTC (rev 20153)
+++ packages/python-qt4/trunk/debian/python-qt4.install 2012-01-27 17:21:50 UTC (rev 20154)
@@ -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/*
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2012-01-27 10:30:00 UTC (rev 20153)
+++ packages/python-qt4/trunk/debian/rules 2012-01-27 17:21:50 UTC (rev 20154)
@@ -13,6 +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])')
export QMAKESPEC=linux-g++
@@ -59,6 +60,7 @@
cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
-m /usr/lib/python$*/config \
-d /usr/lib/python$*/$(call py_sitename, $*) \
+ --dbus /usr/include/dbus-1.0 \
$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin)
touch $@
@@ -103,6 +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-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.
@@ -151,13 +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
- # No python3 DBUS yet
- #if [ -e $(d3_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so ]; then \
- # mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*);\
- # mv $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so \
- # debian/python-qt4-dbus-dbg$(call py_dbusmoddir,$*);\
- # echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-pyqt4.dbus.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
@@ -208,11 +210,16 @@
dh_installdocs -A NEWS THANKS
dh_link
dh_sip
+ dh_sip3
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
set -e; \
- for p in python-qt4 python3-pyqt4 python-qt4-dbus python-qt4-gl python-qt4-sql \
- python3-pyqt4.qtsql python-qt4-phonon python3-pyqt4.phonon ; do \
+ for p in python-qt4 python3-pyqt4 \
+ python-qt4-dbus python3-pyqt4-dbus \
+ python-qt4-gl \
+ python-qt4-sql python3-pyqt4.qtsql \
+ python-qt4-phonon python3-pyqt4.phonon \
+ ; do \
DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
mkdir -p debian/$$p-dbg/usr/share/doc; \
@@ -229,6 +236,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/
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