[neon/forks/pyqt5/Neon/release-lts] debian: [sip5] Build with sip-build instead of configure.py.
Dmitry Shachnev
null at kde.org
Wed May 26 11:29:29 BST 2021
Git commit e2218a0298dddffea011fd2756050e21d947f73d by Dmitry Shachnev.
Committed on 14/06/2020 at 11:46.
Pushed by jriddell into branch 'Neon/release-lts'.
[sip5] Build with sip-build instead of configure.py.
M +1 -0 debian/changelog
M +4 -4 debian/pyqt5-dev-tools.install
A +1 -0 debian/python3-dbus.mainloop.pyqt5-dbg.install
A +1 -0 debian/python3-dbus.mainloop.pyqt5.install
A +11 -0 debian/python3-pyqt5-dbg.install
M +25 -25 debian/python3-pyqt5.install
A +2 -0 debian/python3-pyqt5.qtmultimedia-dbg.install
M +4 -4 debian/python3-pyqt5.qtmultimedia.install
A +1 -0 debian/python3-pyqt5.qtopengl-dbg.install
M +2 -2 debian/python3-pyqt5.qtopengl.install
A +2 -0 debian/python3-pyqt5.qtpositioning-dbg.install
M +4 -4 debian/python3-pyqt5.qtpositioning.install
A +3 -0 debian/python3-pyqt5.qtquick-dbg.install
M +6 -6 debian/python3-pyqt5.qtquick.install
A +1 -0 debian/python3-pyqt5.qtsensors-dbg.install
M +2 -2 debian/python3-pyqt5.qtsensors.install
A +1 -0 debian/python3-pyqt5.qtserialport-dbg.install
M +2 -2 debian/python3-pyqt5.qtserialport.install
A +1 -0 debian/python3-pyqt5.qtsql-dbg.install
M +2 -2 debian/python3-pyqt5.qtsql.install
A +1 -0 debian/python3-pyqt5.qtsvg-dbg.install
M +2 -2 debian/python3-pyqt5.qtsvg.install
A +1 -0 debian/python3-pyqt5.qtwebchannel-dbg.install
M +2 -2 debian/python3-pyqt5.qtwebchannel.install
A +2 -0 debian/python3-pyqt5.qtwebkit-dbg.install
M +4 -4 debian/python3-pyqt5.qtwebkit.install
A +1 -0 debian/python3-pyqt5.qtwebsockets-dbg.install
M +2 -2 debian/python3-pyqt5.qtwebsockets.install
A +1 -0 debian/python3-pyqt5.qtx11extras-dbg.install
M +2 -2 debian/python3-pyqt5.qtx11extras.install
A +1 -0 debian/python3-pyqt5.qtxmlpatterns-dbg.install
M +2 -2 debian/python3-pyqt5.qtxmlpatterns.install
M +15 -71 debian/rules
https://invent.kde.org/neon/forks/pyqt5/commit/e2218a0298dddffea011fd2756050e21d947f73d
diff --git a/debian/changelog b/debian/changelog
index e6ca26dc..d9908f57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pyqt5 (5.15.0+dfsg-2) UNRELEASED; urgency=medium
* Switch from sip4 to sip5:
- Update build-dependencies.
+ - Build with sip-build instead of configure.py.
-- Dmitry Shachnev <mitya57 at debian.org> Sun, 14 Jun 2020 14:19:50 +0300
diff --git a/debian/pyqt5-dev-tools.install b/debian/pyqt5-dev-tools.install
index 9bec48b4..beb7604d 100644
--- a/debian/pyqt5-dev-tools.install
+++ b/debian/pyqt5-dev-tools.install
@@ -1,5 +1,5 @@
usr/bin/*
-usr/lib/python3*/dist-packages/PyQt5/pylupdate.so
-usr/lib/python3*/dist-packages/PyQt5/pylupdate_main.py
-usr/lib/python3*/dist-packages/PyQt5/pyrcc.so
-usr/lib/python3*/dist-packages/PyQt5/pyrcc_main.py
+usr/lib/python3/dist-packages/PyQt5/pylupdate.abi3.so
+usr/lib/python3/dist-packages/PyQt5/pylupdate_main.py
+usr/lib/python3/dist-packages/PyQt5/pyrcc.abi3.so
+usr/lib/python3/dist-packages/PyQt5/pyrcc_main.py
diff --git a/debian/python3-dbus.mainloop.pyqt5-dbg.install b/debian/python3-dbus.mainloop.pyqt5-dbg.install
new file mode 100644
index 00000000..78c4dba3
--- /dev/null
+++ b/debian/python3-dbus.mainloop.pyqt5-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/dbus/mainloop/pyqt5.cpython-*.so
diff --git a/debian/python3-dbus.mainloop.pyqt5.install b/debian/python3-dbus.mainloop.pyqt5.install
new file mode 100644
index 00000000..500437dd
--- /dev/null
+++ b/debian/python3-dbus.mainloop.pyqt5.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/dbus/mainloop/pyqt5.abi3.so
diff --git a/debian/python3-pyqt5-dbg.install b/debian/python3-pyqt5-dbg.install
new file mode 100644
index 00000000..b751b277
--- /dev/null
+++ b/debian/python3-pyqt5-dbg.install
@@ -0,0 +1,11 @@
+usr/lib/python3/dist-packages/PyQt5/Qt.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtCore.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtDBus.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtDesigner.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtGui.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtHelp.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtNetwork.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtPrintSupport.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtTest.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtWidgets.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtXml.cpython-*.so
diff --git a/debian/python3-pyqt5.install b/debian/python3-pyqt5.install
index 0f2b56a3..1707923b 100644
--- a/debian/python3-pyqt5.install
+++ b/debian/python3-pyqt5.install
@@ -1,26 +1,26 @@
usr/lib/*/qt5/plugins/designer/libpyqt5.so
-usr/lib/python3*/dist-packages/PyQt5/Qt.so
-usr/lib/python3*/dist-packages/PyQt5/QtCore.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtCore.so
-usr/lib/python3*/dist-packages/PyQt5/QtDBus.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtDBus.so
-usr/lib/python3*/dist-packages/PyQt5/QtDesigner.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtDesigner.so
-usr/lib/python3*/dist-packages/PyQt5/QtGui.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtGui.so
-usr/lib/python3*/dist-packages/PyQt5/QtHelp.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtHelp.so
-usr/lib/python3*/dist-packages/PyQt5/QtNetwork.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtNetwork.so
-usr/lib/python3*/dist-packages/PyQt5/QtPrintSupport.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtPrintSupport.so
-usr/lib/python3*/dist-packages/PyQt5/QtTest.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtTest.so
-usr/lib/python3*/dist-packages/PyQt5/QtWidgets.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtWidgets.so
-usr/lib/python3*/dist-packages/PyQt5/QtXml.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtXml.so
-usr/lib/python3*/dist-packages/PyQt5/__init__.py
-usr/lib/python3*/dist-packages/PyQt5/uic/*
-usr/lib/python3*/dist-packages/PyQt5-5.*.dist-info/METADATA
-usr/lib/python3*/dist-packages/PyQt5-5.*.dist-info/INSTALLER
+usr/lib/python3/dist-packages/PyQt5-5.*.dist-info/INSTALLER
+usr/lib/python3/dist-packages/PyQt5-5.*.dist-info/METADATA
+usr/lib/python3/dist-packages/PyQt5/Qt.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtCore.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtCore.pyi
+usr/lib/python3/dist-packages/PyQt5/QtDBus.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtDBus.pyi
+usr/lib/python3/dist-packages/PyQt5/QtDesigner.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtDesigner.pyi
+usr/lib/python3/dist-packages/PyQt5/QtGui.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtGui.pyi
+usr/lib/python3/dist-packages/PyQt5/QtHelp.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtHelp.pyi
+usr/lib/python3/dist-packages/PyQt5/QtNetwork.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtNetwork.pyi
+usr/lib/python3/dist-packages/PyQt5/QtPrintSupport.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtPrintSupport.pyi
+usr/lib/python3/dist-packages/PyQt5/QtTest.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtTest.pyi
+usr/lib/python3/dist-packages/PyQt5/QtWidgets.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtWidgets.pyi
+usr/lib/python3/dist-packages/PyQt5/QtXml.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtXml.pyi
+usr/lib/python3/dist-packages/PyQt5/__init__.py
+usr/lib/python3/dist-packages/PyQt5/uic/*
diff --git a/debian/python3-pyqt5.qtmultimedia-dbg.install b/debian/python3-pyqt5.qtmultimedia-dbg.install
new file mode 100644
index 00000000..6db003ee
--- /dev/null
+++ b/debian/python3-pyqt5.qtmultimedia-dbg.install
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/PyQt5/QtMultimedia.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtMultimediaWidgets.cpython-*.so
diff --git a/debian/python3-pyqt5.qtmultimedia.install b/debian/python3-pyqt5.qtmultimedia.install
index 3bff0c99..8d7e85da 100644
--- a/debian/python3-pyqt5.qtmultimedia.install
+++ b/debian/python3-pyqt5.qtmultimedia.install
@@ -1,4 +1,4 @@
-usr/lib/python3*/dist-packages/PyQt5/QtMultimedia.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtMultimedia.so
-usr/lib/python3*/dist-packages/PyQt5/QtMultimediaWidgets.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtMultimediaWidgets.so
+usr/lib/python3/dist-packages/PyQt5/QtMultimedia.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtMultimedia.pyi
+usr/lib/python3/dist-packages/PyQt5/QtMultimediaWidgets.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtMultimediaWidgets.pyi
diff --git a/debian/python3-pyqt5.qtopengl-dbg.install b/debian/python3-pyqt5.qtopengl-dbg.install
new file mode 100644
index 00000000..ddc76bf6
--- /dev/null
+++ b/debian/python3-pyqt5.qtopengl-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/*OpenGL*.cpython-*.so
diff --git a/debian/python3-pyqt5.qtopengl.install b/debian/python3-pyqt5.qtopengl.install
index 336e06e0..83c55d39 100644
--- a/debian/python3-pyqt5.qtopengl.install
+++ b/debian/python3-pyqt5.qtopengl.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/*OpenGL*.pyi
-usr/lib/python3*/dist-packages/PyQt5/*OpenGL*.so
+usr/lib/python3/dist-packages/PyQt5/*OpenGL*.abi3.so
+usr/lib/python3/dist-packages/PyQt5/*OpenGL*.pyi
diff --git a/debian/python3-pyqt5.qtpositioning-dbg.install b/debian/python3-pyqt5.qtpositioning-dbg.install
new file mode 100644
index 00000000..71b5fefa
--- /dev/null
+++ b/debian/python3-pyqt5.qtpositioning-dbg.install
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/PyQt5/QtLocation.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtPositioning.cpython-*.so
diff --git a/debian/python3-pyqt5.qtpositioning.install b/debian/python3-pyqt5.qtpositioning.install
index a849680d..5143a6ec 100644
--- a/debian/python3-pyqt5.qtpositioning.install
+++ b/debian/python3-pyqt5.qtpositioning.install
@@ -1,4 +1,4 @@
-usr/lib/python3*/dist-packages/PyQt5/QtLocation.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtLocation.so
-usr/lib/python3*/dist-packages/PyQt5/QtPositioning.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtPositioning.so
+usr/lib/python3/dist-packages/PyQt5/QtLocation.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtLocation.pyi
+usr/lib/python3/dist-packages/PyQt5/QtPositioning.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtPositioning.pyi
diff --git a/debian/python3-pyqt5.qtquick-dbg.install b/debian/python3-pyqt5.qtquick-dbg.install
new file mode 100644
index 00000000..9a49df09
--- /dev/null
+++ b/debian/python3-pyqt5.qtquick-dbg.install
@@ -0,0 +1,3 @@
+usr/lib/python3/dist-packages/PyQt5/QtQml.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtQuick.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtQuickWidgets.cpython-*.so
diff --git a/debian/python3-pyqt5.qtquick.install b/debian/python3-pyqt5.qtquick.install
index 9bceceb9..901067a2 100644
--- a/debian/python3-pyqt5.qtquick.install
+++ b/debian/python3-pyqt5.qtquick.install
@@ -1,7 +1,7 @@
usr/lib/*/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
-usr/lib/python3*/dist-packages/PyQt5/QtQml.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtQml.so
-usr/lib/python3*/dist-packages/PyQt5/QtQuick.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtQuick.so
-usr/lib/python3*/dist-packages/PyQt5/QtQuickWidgets.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtQuickWidgets.so
+usr/lib/python3/dist-packages/PyQt5/QtQml.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtQml.pyi
+usr/lib/python3/dist-packages/PyQt5/QtQuick.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtQuick.pyi
+usr/lib/python3/dist-packages/PyQt5/QtQuickWidgets.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtQuickWidgets.pyi
diff --git a/debian/python3-pyqt5.qtsensors-dbg.install b/debian/python3-pyqt5.qtsensors-dbg.install
new file mode 100644
index 00000000..a4052fd7
--- /dev/null
+++ b/debian/python3-pyqt5.qtsensors-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtSensors.cpython-*.so
diff --git a/debian/python3-pyqt5.qtsensors.install b/debian/python3-pyqt5.qtsensors.install
index a8df8bc1..9cfacff8 100644
--- a/debian/python3-pyqt5.qtsensors.install
+++ b/debian/python3-pyqt5.qtsensors.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtSensors.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtSensors.so
+usr/lib/python3/dist-packages/PyQt5/QtSensors.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtSensors.pyi
diff --git a/debian/python3-pyqt5.qtserialport-dbg.install b/debian/python3-pyqt5.qtserialport-dbg.install
new file mode 100644
index 00000000..00ab6a1a
--- /dev/null
+++ b/debian/python3-pyqt5.qtserialport-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtSerialPort.cpython-*.so
diff --git a/debian/python3-pyqt5.qtserialport.install b/debian/python3-pyqt5.qtserialport.install
index 289ccc21..c2ef2dca 100644
--- a/debian/python3-pyqt5.qtserialport.install
+++ b/debian/python3-pyqt5.qtserialport.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtSerialPort.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtSerialPort.so
+usr/lib/python3/dist-packages/PyQt5/QtSerialPort.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtSerialPort.pyi
diff --git a/debian/python3-pyqt5.qtsql-dbg.install b/debian/python3-pyqt5.qtsql-dbg.install
new file mode 100644
index 00000000..b4a41033
--- /dev/null
+++ b/debian/python3-pyqt5.qtsql-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtSql.cpython-*.so
diff --git a/debian/python3-pyqt5.qtsql.install b/debian/python3-pyqt5.qtsql.install
index b735577a..6e094e85 100644
--- a/debian/python3-pyqt5.qtsql.install
+++ b/debian/python3-pyqt5.qtsql.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtSql.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtSql.so
+usr/lib/python3/dist-packages/PyQt5/QtSql.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtSql.pyi
diff --git a/debian/python3-pyqt5.qtsvg-dbg.install b/debian/python3-pyqt5.qtsvg-dbg.install
new file mode 100644
index 00000000..ae1806a1
--- /dev/null
+++ b/debian/python3-pyqt5.qtsvg-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtSvg.cpython-*.so
diff --git a/debian/python3-pyqt5.qtsvg.install b/debian/python3-pyqt5.qtsvg.install
index ae28381f..87108762 100644
--- a/debian/python3-pyqt5.qtsvg.install
+++ b/debian/python3-pyqt5.qtsvg.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtSvg.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtSvg.so
+usr/lib/python3/dist-packages/PyQt5/QtSvg.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtSvg.pyi
diff --git a/debian/python3-pyqt5.qtwebchannel-dbg.install b/debian/python3-pyqt5.qtwebchannel-dbg.install
new file mode 100644
index 00000000..2b35742d
--- /dev/null
+++ b/debian/python3-pyqt5.qtwebchannel-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtWebChannel.cpython-*.so
diff --git a/debian/python3-pyqt5.qtwebchannel.install b/debian/python3-pyqt5.qtwebchannel.install
index ec67df51..815b97b2 100644
--- a/debian/python3-pyqt5.qtwebchannel.install
+++ b/debian/python3-pyqt5.qtwebchannel.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtWebChannel.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtWebChannel.so
+usr/lib/python3/dist-packages/PyQt5/QtWebChannel.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtWebChannel.pyi
diff --git a/debian/python3-pyqt5.qtwebkit-dbg.install b/debian/python3-pyqt5.qtwebkit-dbg.install
new file mode 100644
index 00000000..67ed5c80
--- /dev/null
+++ b/debian/python3-pyqt5.qtwebkit-dbg.install
@@ -0,0 +1,2 @@
+usr/lib/python3/dist-packages/PyQt5/QtWebKit.cpython-*.so
+usr/lib/python3/dist-packages/PyQt5/QtWebKitWidgets.cpython-*.so
diff --git a/debian/python3-pyqt5.qtwebkit.install b/debian/python3-pyqt5.qtwebkit.install
index e607ca37..7826c6bd 100644
--- a/debian/python3-pyqt5.qtwebkit.install
+++ b/debian/python3-pyqt5.qtwebkit.install
@@ -1,4 +1,4 @@
-usr/lib/python3*/dist-packages/PyQt5/QtWebKit.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtWebKit.so
-usr/lib/python3*/dist-packages/PyQt5/QtWebKitWidgets.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtWebKitWidgets.so
+usr/lib/python3/dist-packages/PyQt5/QtWebKit.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtWebKit.pyi
+usr/lib/python3/dist-packages/PyQt5/QtWebKitWidgets.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtWebKitWidgets.pyi
diff --git a/debian/python3-pyqt5.qtwebsockets-dbg.install b/debian/python3-pyqt5.qtwebsockets-dbg.install
new file mode 100644
index 00000000..4b66dbcc
--- /dev/null
+++ b/debian/python3-pyqt5.qtwebsockets-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtWebSockets.cpython-*.so
diff --git a/debian/python3-pyqt5.qtwebsockets.install b/debian/python3-pyqt5.qtwebsockets.install
index 833b9423..1c1b7301 100644
--- a/debian/python3-pyqt5.qtwebsockets.install
+++ b/debian/python3-pyqt5.qtwebsockets.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtWebSockets.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtWebSockets.so
+usr/lib/python3/dist-packages/PyQt5/QtWebSockets.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtWebSockets.pyi
diff --git a/debian/python3-pyqt5.qtx11extras-dbg.install b/debian/python3-pyqt5.qtx11extras-dbg.install
new file mode 100644
index 00000000..7126bbf4
--- /dev/null
+++ b/debian/python3-pyqt5.qtx11extras-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtX11Extras.cpython-*.so
diff --git a/debian/python3-pyqt5.qtx11extras.install b/debian/python3-pyqt5.qtx11extras.install
index a4f82905..1ad095bf 100644
--- a/debian/python3-pyqt5.qtx11extras.install
+++ b/debian/python3-pyqt5.qtx11extras.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtX11Extras.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtX11Extras.so
+usr/lib/python3/dist-packages/PyQt5/QtX11Extras.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtX11Extras.pyi
diff --git a/debian/python3-pyqt5.qtxmlpatterns-dbg.install b/debian/python3-pyqt5.qtxmlpatterns-dbg.install
new file mode 100644
index 00000000..27dbda48
--- /dev/null
+++ b/debian/python3-pyqt5.qtxmlpatterns-dbg.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/PyQt5/QtXmlPatterns.cpython-*.so
diff --git a/debian/python3-pyqt5.qtxmlpatterns.install b/debian/python3-pyqt5.qtxmlpatterns.install
index f6427da6..632d834c 100644
--- a/debian/python3-pyqt5.qtxmlpatterns.install
+++ b/debian/python3-pyqt5.qtxmlpatterns.install
@@ -1,2 +1,2 @@
-usr/lib/python3*/dist-packages/PyQt5/QtXmlPatterns.pyi
-usr/lib/python3*/dist-packages/PyQt5/QtXmlPatterns.so
+usr/lib/python3/dist-packages/PyQt5/QtXmlPatterns.abi3.so
+usr/lib/python3/dist-packages/PyQt5/QtXmlPatterns.pyi
diff --git a/debian/rules b/debian/rules
index ad70b87a..60799452 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
export DH_OPTIONS=${EXTRA_DH_OPTIONS}
-py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
-
CFLAGS=
CPPFLAGS=
CXXFLAGS=
@@ -26,9 +24,6 @@ SPLIT=10
DEFAULT_PYTHON := $(shell py3versions -vd)
ALLPYTHONS := $(shell py3versions -vr)
-PYTHON_INCDIR = $(shell $(1) -c 'from distutils import sysconfig; print(sysconfig.get_python_inc())')
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
PYQT_MODULES := opengl sql webchannel webkit websockets xmlpatterns svg \
multimedia quick serialport sensors x11extras positioning
@@ -37,15 +32,14 @@ PY_PACKAGE_NAMES := pyqt5 $(PYQT_MODULES:%=pyqt5.qt%) dbus.mainloop.pyqt5
export QT_SELECT=qt5
-# LIBS_* is unset to avoid linking to too many libraries
# STRIP is unset to let stripping be handled by dh_strip
SHARED_CONFIGURE_OPTIONS=--confirm-license --verbose \
- -q /usr/bin/qmake -c -j $(SPLIT) \
- STRIP="" MOC=/usr/bin/moc \
- LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
- QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
- QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
- QMAKE_LFLAGS+="${LDFLAGS}"
+ --target-dir /usr/lib/python3/dist-packages \
+ --concatenate $(SPLIT) \
+ --no-make \
+ --qmake-setting 'QMAKE_CFLAGS += "${CFLAGS} ${CPPFLAGS}"' \
+ --qmake-setting 'QMAKE_CXXFLAGS += "${CXXFLAGS} ${CPPFLAGS}"' \
+ --qmake-setting 'QMAKE_LFLAGS += "${LDFLAGS}"'
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
@@ -54,24 +48,17 @@ configure: $(ALLPYTHONS:%=build-%/configure-stamp) $(ALLPYTHONS:%=dbg-build-%/co
build-%/configure-stamp:
dh_testdir
- mkdir -p build-$*
- cp -r config-tests build-$*/
- cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
- -d /usr/lib/python$*/dist-packages \
- --sip-incdir $(call PYTHON_INCDIR, python$*) \
- --no-sip-files \
- $(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin)
+ python$* /usr/bin/sip-build $(SHARED_CONFIGURE_OPTIONS) \
+ --build-dir build-$* \
+ $(if $(filter $(DEFAULT_PYTHON),$*),--pep484-pyi,--no-designer-plugin --no-qml-plugin)
sed -i '/strip/d' build-$*/*/Makefile
touch $@
dbg-build-%/configure-stamp:
dh_testdir
- mkdir -p dbg-build-$*
- cp -r config-tests dbg-build-$*/
- cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
- -d /usr/lib/python$*/dist-packages \
- --sip-incdir $(call PYTHON_INCDIR, python$*-dbg) \
- --debug --no-designer-plugin --no-qml-plugin --no-tools --no-sip-files
+ python$*-dbg /usr/bin/sip-build $(SHARED_CONFIGURE_OPTIONS) \
+ --build-dir dbg-build-$* \
+ --debug --no-designer-plugin --no-qml-plugin --no-tools
sed -i '/strip/d' dbg-build-$*/*/Makefile
sed -i 's/-isystem/-I/' dbg-build-$*/*/Makefile
touch $@
@@ -104,7 +91,7 @@ install-indep: build-indep
dh_install -i
dh_installexamples -Xactiveqt -i
# Use python3 shebangs and regenerate resource files
- export PYTHONPATH=$(CURDIR)/tmp_install_root/usr/lib/python$(DEFAULT_PYTHON)/dist-packages; \
+ export PYTHONPATH=$(CURDIR)/tmp_install_root/usr/lib/python3/dist-packages; \
cd $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/; \
cp --preserve=timestamps /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +; \
@@ -143,51 +130,9 @@ install-arch: build-arch
find debian/python*-dbg ! -type d \
! \( -name '*.so' -o -name '*config_*d*.py' \) | xargs rm -f
-d3_qt5_dbg = debian/python3-pyqt5-dbg
-
install-arch-3.%:
- $(MAKE) -C build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) -C dbg-build-3.$* install INSTALL_ROOT=$(CURDIR)/$(d3_qt5_dbg) DESTDIR=$(CURDIR)/$(d3_qt5_dbg)
-
- mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
- mv $(CURDIR)/debian/tmp$(py3_dbusmoddir)/pyqt5.so \
- $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-
- mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
- mv $(CURDIR)/debian/python3-pyqt5-dbg$(py3_dbusmoddir)/pyqt5.so \
- $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
-
- for module in $(PYQT_MODULES); do \
- mkdir -p debian/python3-pyqt5.qt$$module-dbg/usr/lib/python3.$*/dist-packages/PyQt5; \
- done
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/*OpenGL*.so \
- debian/python3-pyqt5.qtopengl-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSql.so \
- debian/python3-pyqt5.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebChannel.so \
- debian/python3-pyqt5.qtwebchannel-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebKit*.so \
- debian/python3-pyqt5.qtwebkit-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebSockets.so \
- debian/python3-pyqt5.qtwebsockets-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtXmlPatterns.so \
- debian/python3-pyqt5.qtxmlpatterns-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSvg.so \
- debian/python3-pyqt5.qtsvg-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtMultimedia*.so \
- debian/python3-pyqt5.qtmultimedia-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQml.so \
- $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQuick*.so \
- debian/python3-pyqt5.qtquick-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSerialPort.so \
- debian/python3-pyqt5.qtserialport-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSensors.so \
- debian/python3-pyqt5.qtsensors-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtX11Extras.so \
- debian/python3-pyqt5.qtx11extras-dbg/usr/lib/python3.$*/dist-packages/PyQt5
- mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtPositioning.so \
- $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtLocation.so \
- debian/python3-pyqt5.qtpositioning-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ $(MAKE) -C build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp
clean:
dh_testdir
@@ -210,7 +155,6 @@ binary-common:
dh_installman
dh_installchangelogs
dh_installdocs -A NEWS
- dh_sip3
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt5-dev-tools
set -e; \
More information about the Neon-commits
mailing list