From: Peter Michael Green Date: Wed, 24 Nov 2021 08:46:19 +0000 (+0000) Subject: Manual merge of version 5.15.2-1+rpi1 and 5.15.2-2 to produce 5.15.2-2+rpi1 X-Git-Tag: archive/raspbian/5.15.2-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=473c7b7e88b22f353f101908a29507f4f616d42b;p=pyside2.git Manual merge of version 5.15.2-1+rpi1 and 5.15.2-2 to produce 5.15.2-2+rpi1 --- 75e12711172ed914d07240d9462fc4727b77df46 diff --cc debian/changelog index f9d1003,4402505..820ae49 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,11 +1,22 @@@ - pyside2 (5.15.2-1+rpi1) bullseye-staging; urgency=medium ++pyside2 (5.15.2-2+rpi1) bookworm-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. + - -- Raspbian forward porter Fri, 01 Jan 2021 14:16:24 +0000 ++ -- Peter Michael Green Wed, 24 Nov 2021 04:42:48 +0000 ++ + pyside2 (5.15.2-2) unstable; urgency=medium + + * Backport upstream patches for Python 3.10 support (closes: #999369). + * Backport upstream patch to adapt for LLVM 12.01. + * Run build-time tests with all supported Python versions. + - Add a patch to make the tests find the matching build directory. + + -- Dmitry Shachnev Tue, 16 Nov 2021 12:16:14 +0300 pyside2 (5.15.2-1) unstable; urgency=medium diff --cc debian/rules index c26119b,ccfe66f..ccfa71d --- a/debian/rules +++ b/debian/rules @@@ -61,7 -55,9 +61,9 @@@ override_dh_auto_clean override_dh_auto_test: ifeq (mips64el,$(DEB_HOST_ARCH)) # See https://bugs.debian.org/868745 - #QSG_NO_DEPTH_BUFFER=1 xvfb-run python3 testrunner.py test - 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 python3 testrunner.py test - 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