[Python-modules-commits] r30042 - in packages/pyqt5/trunk/debian (15 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Mon Aug 4 06:40:42 UTC 2014
Date: Monday, August 4, 2014 @ 06:40:41
Author: kitterman
Revision: 30042
* Add support for python in addition to python3 because the upcoming calibre
2.X series of releases will use PyQt5 with Python and not Python 3
- Add python build-depends to debian/control
- Add python-* equivalents of existing python3-* packages to debian/
control
- Update debian/rules to account for python as well as python3
- Set minimum python3 version to 3.3 since the revised debug configure
rule will not work for 3.2
- Replicate and update all python3-* .install files as python-*
Added:
packages/pyqt5/trunk/debian/python-pyqt5.install
packages/pyqt5/trunk/debian/python-pyqt5.qtmultimedia.install
packages/pyqt5/trunk/debian/python-pyqt5.qtopengl.install
packages/pyqt5/trunk/debian/python-pyqt5.qtpositioning.install
packages/pyqt5/trunk/debian/python-pyqt5.qtquick.install
packages/pyqt5/trunk/debian/python-pyqt5.qtsensors.install
packages/pyqt5/trunk/debian/python-pyqt5.qtserialport.install
packages/pyqt5/trunk/debian/python-pyqt5.qtsql.install
packages/pyqt5/trunk/debian/python-pyqt5.qtsvg.install
packages/pyqt5/trunk/debian/python-pyqt5.qtwebkit.install
packages/pyqt5/trunk/debian/python-pyqt5.qtx11extras.install
packages/pyqt5/trunk/debian/python-pyqt5.qtxmlpatterns.install
Modified:
packages/pyqt5/trunk/debian/changelog
packages/pyqt5/trunk/debian/control
packages/pyqt5/trunk/debian/rules
Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog 2014-08-04 01:28:42 UTC (rev 30041)
+++ packages/pyqt5/trunk/debian/changelog 2014-08-04 06:40:41 UTC (rev 30042)
@@ -1,3 +1,17 @@
+pyqt5 (5.3.1+dfsg-4) unstable; urgency=medium
+
+ * Add support for python in addition to python3 because the upcoming calibre
+ 2.X series of releases will use PyQt5 with Python and not Python 3
+ - Add python build-depends to debian/control
+ - Add python-* equivalents of existing python3-* packages to debian/
+ control
+ - Update debian/rules to account for python as well as python3
+ - Set minimum python3 version to 3.3 since the revised debug configure
+ rule will not work for 3.2
+ - Replicate and update all python3-* .install files as python-*
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 03 Aug 2014 18:48:21 -0400
+
pyqt5 (5.3.1+dfsg-3) unstable; urgency=medium
* debian/tests/import: Redirect stderr to stdout for debug interpreter.
Modified: packages/pyqt5/trunk/debian/control
===================================================================
--- packages/pyqt5/trunk/debian/control 2014-08-04 01:28:42 UTC (rev 30041)
+++ packages/pyqt5/trunk/debian/control 2014-08-04 06:40:41 UTC (rev 30042)
@@ -30,13 +30,19 @@
python3-dbus-dbg,
python3-sip-dbg,
python3-sip-dev (>= 4.16),
+ python-all-dbg,
+ python-all-dev (>= 2.6.6-3~),
+ python-dbus,
+ python-dbus-dbg,
+ python-sip-dbg,
+ python-sip-dev (>= 4.16),
python3-sphinx,
python-dbus-dev,
qtdeclarative5-dev (>= 5.3),
qtmultimedia5-dev (>= 5.3),
qtpositioning5-dev (>= 5.3),
qttools5-dev (>= 5.3)
-X-Python3-Version: >= 3.2
+X-Python3-Version: >= 3.3
Standards-Version: 3.9.5
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyqt5/trunk/
@@ -380,7 +386,7 @@
Package: pyqt5-dev
Architecture: all
-Depends: python3-sip-dev, ${misc:Depends}, ${python3:Depends}
+Depends: python3-sip-dev | python-sip-dev, ${misc:Depends}
Description: Development files for PyQt5
This package contains the source SIP files from which the Python
bindings for Qt5 are created. They are needed for building PyQt5
@@ -399,7 +405,7 @@
Package: pyqt5-examples
Architecture: all
Suggests: qt5-doc
-Depends: python3-pyqt5, libjs-jquery, ${misc:Depends}
+Depends: python3-pyqt5 | python-pyqt5, libjs-jquery, ${misc:Depends}
Description: Examples and demos for PyQt5
PyQt5 exposes the Qt5 GUI toolkit in Python.
.
@@ -416,3 +422,334 @@
* a user interface compiler (pyuic5)
* a resource file generator (pyrcc5)
* a translation string finder (pylupdate5)
+
+Package: python-pyqt5
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${sip:Depends}
+Suggests: python-pyqt5-dbg
+Description: Python bindings for Qt5
+ PyQt5 exposes the Qt5 API to Python. This package contains the following
+ modules:
+ * QtCore
+ * QtDBus
+ * QtDesigner
+ * QtGui
+ * QtHelp
+ * QtNetwork
+ * QtPrintSupport
+ * QtTest
+ * QtWidgets
+
+Package: python-pyqt5-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5 (= ${binary:Version}),
+ python-sip-dbg,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5 (debug extensions)
+ PyQt5 exposes the Qt5 API to Python.
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-dbus.mainloop.pyqt5
+Architecture: any
+Depends: python-dbus,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: D-Bus Support for PyQt5 with Python
+ The D-Bus module of PyQt5 provides integration of PyQt5 applications
+ with the D-Bus main loop for Python.
+
+Package: python-dbus.mainloop.pyqt5-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: python-dbg,
+ python-dbus-dbg,
+ python-dbus.mainloop.pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: D-Bus Support for PyQt5 (debug extensions for Python)
+ The D-Bus module of PyQt5 provides integration of PyQt5 applications
+ with the D-Bus main loop for Python.
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-pyqt5.qtopengl
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's OpenGL module
+ The OpenGL module of PyQt5 provides widgets and utility classes
+ for OpenGL rendering in a PyQt5 application.
+
+Package: python-pyqt5.qtopengl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtopengl (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's OpenGL module (debug extension)
+ The OpenGL module of PyQt5 provides widgets and utility classes
+ for OpenGL rendering in a PyQt5 application.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtsql
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's SQL module
+ The SQL module of PyQt5 provides widgets and utility classes for
+ Python SQL database access.
+
+Package: python-pyqt5.qtsql-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtsql (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's SQL module (debug extension)
+ The SQL module of PyQt5 provides widgets and utility classes for
+ Python SQL database access.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtwebkit
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's WebKit module
+ The WebKit module of PyQt5 provides a Web browser engine that makes it easy
+ to embed HTML content into your PyQt application.
+
+Package: python-pyqt5.qtwebkit-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtwebkit (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's WebKit module (debug extensions)
+ The WebKit module of PyQt5 provides a Web browser engine that makes it easy
+ to embed HTML content into your PyQt application.
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-pyqt5.qtxmlpatterns
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's XmlPatterns module
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+ This package provides a PyQt binding for QtXmlPatterns.
+
+Package: python-pyqt5.qtxmlpatterns-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtxmlpatterns (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's XmlPatterns module (debug extension)
+ QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
+ This package provides a PyQt binding for QtXmlPatterns.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtsvg
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's SVG module
+ The SVG module of PyQt5 provides The QtSvg module provides classes for
+ displaying the contents of SVG files.
+
+Package: python-pyqt5.qtsvg-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtsvg (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's SVG module (debug extension)
+ The SVG module of PyQt5 provides The QtSvg module provides classes for
+ displaying the contents of SVG files.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtmultimedia
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's Multimedia module
+ The Multimedia module of PyQt5 provides a set of APIs to play and record
+ media, and manage a collection of media content.
+
+Package: python-pyqt5.qtmultimedia-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtmultimedia (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for Qt5's Multimedia module (debug extensions)
+ The Multimedia module of PyQt5 provides a set of APIs to play and record
+ media, and manage a collection of media content.
+ .
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-pyqt5.qtquick
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtQuick module
+ The QtQuick module of PyQt5 provides a framework for developing applications
+ and libraries with the QML language.
+
+Package: python-pyqt5.qtquick-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtquick (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtQuick module (debug extension)
+ The QtQuick module of PyQt5 provides a framework for developing applications
+ and libraries with the QML language.
+ .
+ This package contains the extensions built for the Python 3 debug interpreter.
+
+Package: python-pyqt5.qtserialport
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtSerialPort module
+ The QtSerialPort module of PyQt5 provides a set of APIs to use serial ports
+ from PyQt applications.
+
+Package: python-pyqt5.qtserialport-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtserialport (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtSerialPort module (debug extension)
+ The QtSerialPort module of PyQt5 provides a set of APIs to use serial ports
+ from PyQt applications.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtsensors
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtSensors module
+ The QtSensors module of PyQt5 provides a set of APIs to access sensors
+ hardware from PyQt applications.
+
+Package: python-pyqt5.qtsensors-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtsensors (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtSensors module (debug extension)
+ The QtSensors module of PyQt5 provides a set of APIs to access sensors
+ hardware from PyQt applications.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtx11extras
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtX11Extras module
+ The QtX11Extras module of PyQt5 provides an API to access X11-specific
+ information and classes.
+
+Package: python-pyqt5.qtx11extras-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtx11extras (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtX11Extras module (debug extension)
+ The QtX11Extras module of PyQt5 provides an API to access X11-specific
+ information and classes.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyqt5.qtpositioning
+Architecture: any
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtPositioning module
+ The QtPositioning module of PyQt5 provides an API to access location and
+ positioning information.
+
+Package: python-pyqt5.qtpositioning-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtpositioning (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python bindings for QtPositioning module (debug extension)
+ The QtPositioning module of PyQt5 provides an API to access location and
+ positioning information.
+ .
+ This package contains the extension built for the Python debug interpreter.
Added: packages/pyqt5/trunk/debian/python-pyqt5.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1,12 @@
+usr/lib/python2*/*-packages/PyQt5/Qt.so
+usr/lib/python2*/*-packages/PyQt5/QtCore.so
+usr/lib/python2*/*-packages/PyQt5/QtDBus.so
+usr/lib/python2*/*-packages/PyQt5/QtDesigner.so
+usr/lib/python2*/*-packages/PyQt5/QtGui.so
+usr/lib/python2*/*-packages/PyQt5/QtHelp.so
+usr/lib/python2*/*-packages/PyQt5/QtNetwork.so
+usr/lib/python2*/*-packages/PyQt5/QtPrintSupport.so
+usr/lib/python2*/*-packages/PyQt5/QtTest.so
+usr/lib/python2*/*-packages/PyQt5/QtWidgets.so
+usr/lib/python2*/*-packages/PyQt5/__init__.py
+usr/lib/python2*/*-packages/PyQt5/uic/*
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtmultimedia.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtmultimedia.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtmultimedia.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1,2 @@
+usr/lib/python2*/*-packages/PyQt5/QtMultimedia.so
+usr/lib/python2*/*-packages/PyQt5/QtMultimediaWidgets.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtopengl.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtopengl.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtopengl.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/*OpenGL*.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtpositioning.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtpositioning.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtpositioning.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtPositioning.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtquick.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtquick.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtquick.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1,2 @@
+usr/lib/python2*/*-packages/PyQt5/QtQml.so
+usr/lib/python2*/*-packages/PyQt5/QtQuick*.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtsensors.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtsensors.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtsensors.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtSensors.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtserialport.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtserialport.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtserialport.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtSerialPort.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtsql.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtsql.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtsql.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtSql.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtsvg.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtsvg.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtsvg.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtSvg.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtwebkit.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtwebkit.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtwebkit.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1,2 @@
+usr/lib/python2*/*-packages/PyQt5/QtWebKit.so
+usr/lib/python2*/*-packages/PyQt5/QtWebKitWidgets.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtx11extras.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtx11extras.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtx11extras.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtX11Extras.so
Added: packages/pyqt5/trunk/debian/python-pyqt5.qtxmlpatterns.install
===================================================================
--- packages/pyqt5/trunk/debian/python-pyqt5.qtxmlpatterns.install (rev 0)
+++ packages/pyqt5/trunk/debian/python-pyqt5.qtxmlpatterns.install 2014-08-04 06:40:41 UTC (rev 30042)
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtXmlPatterns.so
Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules 2014-08-04 01:28:42 UTC (rev 30041)
+++ packages/pyqt5/trunk/debian/rules 2014-08-04 06:40:41 UTC (rev 30042)
@@ -5,6 +5,7 @@
export DH_OPTIONS=${EXTRA_DH_OPTIONS}
py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+py_dbusmoddir = $(shell python -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
debian_version = $(word 2,$(shell dpkg-parsechangelog | grep ^Version:))
upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
@@ -30,6 +31,8 @@
PYTHON3S := $(shell py3versions -vr)
DEFAULT_PYTHON := $(shell py3versions -vd)
+PYTHON := 2.7
+ALLPYTHONS := $(PYTHON3S) $(PYTHON)
export QT_SELECT=qt5
@@ -46,7 +49,7 @@
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-configure: $(PYTHON3S:%=build-%/configure-stamp) $(PYTHON3S:%=dbg-build-%/configure-stamp)
+configure: $(ALLPYTHONS:%=build-%/configure-stamp) $(ALLPYTHONS:%=dbg-build-%/configure-stamp)
build-%/configure-stamp:
dh_testdir
@@ -54,6 +57,7 @@
cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
-m $(shell python$*-config --configdir) \
-d /usr/lib/python$*/dist-packages \
+ --sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),m,) \
--dbus /usr/include/dbus-1.0 \
$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin --no-tools)
touch $@
@@ -63,15 +67,16 @@
mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
-m $(shell python$*-dbg-config --configdir) \
- -l /usr/include/python$*$(if $(filter 3.2, $*),dmu,dm) \
+ -l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
-d /usr/lib/python$*/dist-packages \
+ --sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
--debug --no-designer-plugin --no-qml-plugin --no-tools
sed -i 's/-isystem/-I/' dbg-build-$*/*/Makefile
touch $@
build: build-arch build-indep
-build-arch: $(PYTHON3S:%=build-%/build-stamp) $(PYTHON3S:%=dbg-build-%/build-stamp)
+build-arch: $(ALLPYTHONS:%=build-%/build-stamp) $(ALLPYTHONS:%=dbg-build-%/build-stamp)
build-indep: build-$(DEFAULT_PYTHON)/build-stamp
build-%/build-stamp: build-%/configure-stamp
@@ -120,7 +125,7 @@
# and therefore might try to access the same files at the same time.
# Therefore, instead of depending on the install-arch-% rules,
# we invoke them explicitly.
- for p in $(PYTHON3S) ; do \
+ for p in $(ALLPYTHONS) ; do \
$(MAKE) -f debian/rules install-arch-$$p;\
done
@@ -129,6 +134,11 @@
find debian/python*-dbg ! -type d \
! \( -name '*.so' -o -name '*config_*d*.py' \) | xargs rm -f
+ for i in $$(find debian/python-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+
d3_qt5_dbg = debian/python3-pyqt5-dbg
install-arch-3.%:
@@ -173,10 +183,53 @@
mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtPositioning.so \
debian/python3-pyqt5.qtpositioning-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+d_qt5_dbg = debian/python-pyqt5-dbg
+
+install-arch-2.%:
+ $(MAKE) -C build-2.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-2.$* install INSTALL_ROOT=$(CURDIR)/$(d_qt5_dbg) DESTDIR=$(CURDIR)/$(d_qt5_dbg)
+ rm -rf $(CURDIR)/debian/tmp/usr/share/sip
+
+ mkdir -p $(CURDIR)/debian/python-dbus.mainloop.pyqt5/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/tmp$(py_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python-dbus.mainloop.pyqt5/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+
+ mkdir -p $(CURDIR)/debian/python-dbus.mainloop.pyqt5-dbg/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/python-pyqt5-dbg$(py_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python-dbus.mainloop.pyqt5-dbg/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+
+ # Don't initiate the uic/widget-plugins
+ touch $(CURDIR)/debian/tmp/usr/lib/python2.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
+ for module in opengl sql webkit xmlpatterns svg multimedia quick serialport sensors x11extras positioning; do \
+ mkdir -p debian/python-pyqt5.qt$$module-dbg/usr/lib/python2.$*/dist-packages/PyQt5; \
+ done
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/*OpenGL*.so \
+ debian/python-pyqt5.qtopengl-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSql.so \
+ debian/python-pyqt5.qtsql-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtWebKit*.so \
+ debian/python-pyqt5.qtwebkit-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtXmlPatterns.so \
+ debian/python-pyqt5.qtxmlpatterns-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSvg.so \
+ debian/python-pyqt5.qtsvg-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtMultimedia*.so \
+ debian/python-pyqt5.qtmultimedia-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtQml.so \
+ $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtQuick*.so \
+ debian/python-pyqt5.qtquick-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSerialPort.so \
+ debian/python-pyqt5.qtserialport-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSensors.so \
+ debian/python-pyqt5.qtsensors-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtX11Extras.so \
+ debian/python-pyqt5.qtx11extras-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtPositioning.so \
+ debian/python-pyqt5.qtpositioning-dbg/usr/lib/python2.$*/dist-packages/PyQt5
clean:
dh_testdir
dh_testroot
- rm -rf $(PYTHON3S:%=build-%) $(PYTHON3S:%=dbg-build-%)
+ rm -rf $(ALLPYTHONS:%=build-%) $(ALLPYTHONS:%=dbg-build-%)
find . -type d -name __pycache__ | xargs rm -rf
cd sip; rm -rf Qt opengl_types.sip pyqt-gpl.sip5
rm -f examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
@@ -196,6 +249,7 @@
$(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/html
dh_sphinxdoc
endif
+ dh_sip
dh_sip3
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt5-dev-tools
@@ -205,13 +259,25 @@
python3-pyqt5.qtsvg python3-pyqt5.qtxmlpatterns \
python3-pyqt5.qtquick python3-pyqt5.qtserialport \
python3-pyqt5.qtsensors python3-pyqt5.qtx11extras \
- python3-pyqt5.qtpositioning python3-dbus.mainloop.pyqt5; do \
+ python3-pyqt5.qtpositioning python3-dbus.mainloop.pyqt5 \
+ python-pyqt5 python-pyqt5.qtopengl python-pyqt5.qtsql \
+ python-pyqt5.qtwebkit python-pyqt5.qtmultimedia \
+ python-pyqt5.qtsvg python-pyqt5.qtxmlpatterns \
+ python-pyqt5.qtquick python-pyqt5.qtserialport \
+ python-pyqt5.qtsensors python-pyqt5.qtx11extras \
+ python-pyqt5.qtpositioning python-dbus.mainloop.pyqt5; 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; \
ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
done
endif
+ dh_python2 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
+ rm -rf $(CURDIR)/debian/python-pyqt5/usr/lib/python2.7/dist-packages/PyQt5/uic/port_v3
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/bin
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/share/sip
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/PyQt5/uic
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/dbus
dh_python3 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
rm -rf $(CURDIR)/debian/python3-pyqt5/usr/lib/python3/dist-packages/PyQt5/uic/port_v2
rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/bin
More information about the Python-modules-commits
mailing list