From: Raspbian automatic forward porter Date: Sat, 8 Feb 2025 00:05:15 +0000 (+0000) Subject: Merge version 5.15.16-1+rpi1 and 5.15.16-3.1 to produce 5.15.16-3.1+rpi1 X-Git-Tag: archive/raspbian/5.15.16-3.1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8427c9afe5a07b9233ac79d98e72a8fa84d7c19;p=pyside2.git Merge version 5.15.16-1+rpi1 and 5.15.16-3.1 to produce 5.15.16-3.1+rpi1 --- e8ff0ea344e3ca48561e657ed13cc3a3e3bbcfc1 diff --cc debian/changelog index 2aa8935,c49b8cc..0d22275 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,26 +1,42 @@@ - pyside2 (5.15.16-1+rpi1) trixie-staging; urgency=medium ++pyside2 (5.15.16-3.1+rpi1) trixie-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. + + [changes introduced in 5.13.2-3+rpi1 by Peter Michael Green] + * Disable testsuite. + + [changes brought forward from 5.15.2-2+rpi2 by Peter Michael Green at Sat, 05 Feb 2022 15:09:17 +0000] + * Add build-conflicts on libshiboken2-dev + * Improve replacement rules for paths + (still not ideal) + - -- Raspbian forward porter Tue, 10 Dec 2024 23:58:56 +0000 ++ -- Raspbian forward porter Sat, 08 Feb 2025 00:05:15 +0000 ++ + pyside2 (5.15.16-3.1) unstable; urgency=medium + + * Non-maintainer upload + * Also make the tests non-fatal on ppc64el, in order to + unblock python3.13-default transition, see #1092890 + + -- Graham Inggs Sat, 25 Jan 2025 16:33:38 +0000 + + pyside2 (5.15.16-3) unstable; urgency=medium + + * Team upload. + * Drop 20 unused binary packages, as part of Qt 5 removal process. + - Drop Modify-sendCommand-signatures.patch, no longer needed. + + -- Dmitry Shachnev Wed, 15 Jan 2025 22:09:58 +0300 + + pyside2 (5.15.16-2) unstable; urgency=medium + + * Team upload. + * Backport upstream patches to support Python 3.13 (closes: #1091430). + * Use public version of PyLong_AsInt for Python >= 3.13. + + -- Dmitry Shachnev Sat, 04 Jan 2025 14:54:50 +0300 pyside2 (5.15.16-1) unstable; urgency=medium diff --cc debian/control index f9805ba,c1dd970..04aebde --- a/debian/control +++ b/debian/control @@@ -49,17 -34,11 +34,13 @@@ Build-Depends: chrpath qtchooser, qtdeclarative5-dev (>= 5.15), qtdeclarative5-private-dev (>= 5.15), - qtlocation5-dev (>= 5.15), qtmultimedia5-dev (>= 5.15), - qtpositioning5-dev (>= 5.15), - qtquickcontrols2-5-dev (>= 5.15), - qtscript5-dev (>= 5.15), qttools5-dev (>= 5.15), - qtwebengine5-dev (>= 5.15) [amd64 arm64 armhf i386 mips64el], - xauth, - xvfb + qtwebengine5-dev (>= 5.15) [amd64 arm64 i386 mips64el], + xvfb, + xauth +Build-Conflicts: + libshiboken2-dev Rules-Requires-Root: no Standards-Version: 4.7.0 Homepage: https://wiki.qt.io/Qt_for_Python @@@ -691,20 -438,8 +440,8 @@@ Description: Python bindings for Qt5 Op . This package contains Python 3 bindings for the OpenGLFunctions module. - Package: python3-pyside2.qtscxml - Architecture: any - Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, - python3-pyside2.qtcore - Description: Python bindings for Qt5 Scxml (Python 3) - 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 3 bindings for the Scxml module. - Package: python3-pyside2.qtwebengine -Architecture: amd64 arm64 armhf i386 mips64el +Architecture: amd64 arm64 i386 mips64el Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, python3-pyside2.qtcore Description: Python bindings for Qt5 Web Engine (Python 3) diff --cc debian/rules index 5806ec0,f928389..00ea812 --- a/debian/rules +++ b/debian/rules @@@ -52,19 -52,12 +52,19 @@@ 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 + rm -f build_history/*/build_dir.txt + override_dh_auto_test: - ifeq (mips64el,$(DEB_HOST_ARCH)) + ifneq (,$(filter $(DEB_HOST_ARCH), mips64el ppc64el)) # See https://bugs.debian.org/868745, https://bugs.debian.org/1061679 - -QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \ - --test-args '{interpreter} testrunner.py test' + #-QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \ + # --test-args '{interpreter} testrunner.py test' else - xvfb-run -a dh_auto_test -- --system=custom \ - --test-args '{interpreter} testrunner.py test' + #xvfb-run -a dh_auto_test -- --system=custom \ + # --test-args '{interpreter} testrunner.py test' endif