From: Peter Michael Green Date: Fri, 10 Jan 2020 22:17:52 +0000 (+0000) Subject: Manual merge of version 5.11.2-3+rpi1 and 5.13.2-2.2 to produce 5.13.2-2.2+rpi1 X-Git-Tag: archive/raspbian/5.13.2-2.2+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=109c87a74166c88147d980035925f0411fca7629;p=pyside2.git Manual merge of version 5.11.2-3+rpi1 and 5.13.2-2.2 to produce 5.13.2-2.2+rpi1 --- 109c87a74166c88147d980035925f0411fca7629 diff --cc debian/changelog index f7e2422,3adf820..b61dcb0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,94 +1,102 @@@ - pyside2 (5.11.2-3+rpi1) buster-staging; urgency=medium ++pyside2 (5.13.2-2.2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 5.11.2-1+rpi1 by Peter Michael Green at Sun, 23 Dec 2018 23:25:45 +0000] + * Remove armhf from qtwebengine architecture lists. + * Fix clean target. + - -- Raspbian forward porter Thu, 24 Jan 2019 17:32:39 +0000 ++ -- Raspbian forward porter Fri, 10 Jan 2020 02:01:42 +0000 ++ + pyside2 (5.13.2-2.2) unstable; urgency=medium + + * Non-maintainer upload + * Update cmake paths for new locations + + -- Gianfranco Costamagna Sun, 29 Dec 2019 22:44:55 +0100 + + pyside2 (5.13.2-2.1) unstable; urgency=medium + + * Non-maintainer upload + * Add an explicit shiboken dependency to fix FTBFS for reverse-dependencies + cmake based, who expect it being installed (Closes: #946082) + - thanks Tommaso Colombo for the patch + + -- Gianfranco Costamagna Tue, 24 Dec 2019 09:22:39 +0100 + + pyside2 (5.13.2-2) unstable; urgency=medium + + * Do not build-depends on libqt5datavisualization5-dev on mipsel and + mpis64el (Closes: #945174) and limit .*qtdatavisualization binary package + to arch: amd64 arm64 armel armhf i386 ppc64el s390x + * Limit python3-pyside2.qtwebengine to amd64 arm64 armhf i386 mipsel + (qtwebengine5-dev is not available for other architectures) + * Add a patch to blacklist failing tests + + -- Sophie Brun Fri, 22 Nov 2019 10:28:55 +0100 + + pyside2 (5.13.2-1) unstable; urgency=medium + + [ Ondřej Nový ] + * Remove almost all of Python 2 binary packages (no rdeps): + - python-pyside2.qt3dcore + - python-pyside2.qt3dinput + - python-pyside2.qt3dlogic + - python-pyside2.qt3drender + - python-pyside2.qtcharts + - python-pyside2.qtconcurrent + - python-pyside2.qthelp + - python-pyside2.qtlocation + - python-pyside2.qtmultimedia + - python-pyside2.qtmultimediawidgets + - python-pyside2.qtnetwork + - python-pyside2.qtpositioning + - python-pyside2.qtprintsupport + - python-pyside2.qtqml + - python-pyside2.qtquick + - python-pyside2.qtquickwidgets + - python-pyside2.qtscript + - python-pyside2.qtscripttools + - python-pyside2.qtsensors + - python-pyside2.qtsql + - python-pyside2.qttest + - python-pyside2.qttexttospeech + - python-pyside2.qtwebchannel + - python-pyside2.qtwebenginecore + - python-pyside2.qtwebenginewidgets + - python-pyside2.qtwebsockets + - python-pyside2.qtx11extras + - python-pyside2.qtxmlpatterns + + [ Sophie Brun ] + * Update debian/watch + * New upstream version 5.13.2 + * Refresh patches and remove obsolete patches + * Add missing build-deps + * Force pybuild to use distutils, not Cmake + * Replace deprecated upstream option --jobs with --parallel + * Update documentation build + * Add a patch to support Python 3.8 (Closes: #942753) + * Add new binary packages + - python3-pyside2.qtdatavisualization + - python3-pyside2.qtopenglfunctions + - python3-pyside2.qtscxml + - python3-pyside2.qtwebengine + * Update list of built files in debian/rules + * Switch pyside2-tools to Python3 + * Switch to debhelper-compat 12 + * Bump Standards-Version to 4.4.1 (no changes) + * Update installation of python3 module shiboken2 + * Add autopkgtest + * Add missing Conflicts/Replaces and Provides for libpyside2-* + * Add a patch to use python3 in pyside2-tools + * Remove disable failing test in debian/rules + * Add missing depends (Closes: #943709) + * Run the tests and add missing build-deps for tests + * Remove useless build-dep pyqt5-dev + + [ Raphaël Hertzog ] + * Drop remaining python2 parts. + + -- Sophie Brun Fri, 15 Nov 2019 10:15:57 +0100 pyside2 (5.11.2-3) unstable; urgency=medium diff --cc debian/control index d9b0809,7bdf925..2d134c1 --- a/debian/control +++ b/debian/control @@@ -51,8 -51,14 +51,13 @@@ Build-Depends: chrpath qtpositioning5-dev, qtscript5-dev, qttools5-dev, - qtwebengine5-dev [amd64 arm64 i386 mipsel] - Standards-Version: 4.2.1 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], -#for tests ++ qtwebengine5-dev [amd64 arm64 i386 mipsel], + qml-module-qtquick2, + qml-module-qtquick-layouts, + qml-module-qtquick-controls, + xvfb, + xauth + Standards-Version: 4.4.1 Homepage: https://wiki.qt.io/Qt_for_Python Vcs-Git: https://salsa.debian.org/qt-kde-team/qt/pyside2.git Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/pyside2 @@@ -368,20 -268,10 +267,10 @@@ Description: Python bindings for Qt5 Qm . This package contains Python 3 bindings for the QtQml module. - Package: python-pyside2.qtwebenginecore - Architecture: amd64 arm64 i386 mipsel - Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} - Description: Python bindings for Qt5 WebEngineCore module (Python 2) - pyside2 provides Python bindings for Qt 5.x framework. - . - Qt is a cross-platform C++ application framework. Qt's primary feature - is its rich set of widgets that provide standard GUI functionality. - . - This package contains Python 2 bindings for the QtWebEngineCore module. - Package: python3-pyside2.qtwebenginecore -Architecture: amd64 arm64 armhf i386 mipsel +Architecture: amd64 arm64 i386 mipsel - Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} + Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, + python3-pyside2.qtcore Description: Python bindings for Qt5 WebEngineCore module (Python 3) pyside2 provides Python bindings for Qt 5.x framework. . @@@ -742,20 -475,12 +474,12 @@@ Description: Python bindings for Qt5 Te . This package contains Python 3 bindings for the QtTest module. - Package: python-pyside2.qtwebenginewidgets - Architecture: amd64 arm64 i386 mipsel - Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} - Description: Python bindings for Qt5 WebEngineWidgets module (Python 2) - pyside2 provides Python bindings for Qt 5.x framework. - . - Qt is a cross-platform C++ application framework. Qt's primary feature - is its rich set of widgets that provide standard GUI functionality. - . - This package contains Python 2 bindings for the QtWebEngineWidgets module. - Package: python3-pyside2.qtwebenginewidgets -Architecture: amd64 arm64 armhf i386 mipsel +Architecture: amd64 arm64 i386 mipsel - Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} + Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, + python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, + python3-pyside2.qtnetwork, python3-pyside2.qtwebchannel, + python3-pyside2.qtwebenginecore, python3-pyside2.qtprintsupport Description: Python bindings for Qt5 WebEngineWidgets module (Python 3) pyside2 provides Python bindings for Qt 5.x framework. . diff --cc debian/rules index 4936416,378efa5..7bc7b6c --- a/debian/rules +++ b/debian/rules @@@ -56,9 -57,5 +57,11 @@@ override_dh_install-arch # not what we need debian/set-paths +override_dh_auto_clean: + dh_auto_clean + rm -rf pyside_package pyside?_build pyside?_install + rm -f sources/pyside2/doc/qtmodules/*.qdocconf sources/pyside2/doc/pyside-config.qdocconf sources/pyside2/doc/pyside.qdocconf.in + find . -name *.qdoconf -delete + + override_dh_auto_test: + xvfb-run python3 testrunner.py test