Manual merge of version 5.15.2-1+rpi1 and 5.15.2-2 to produce 5.15.2-2+rpi1

diff --cc debian/changelog
index f9d1003d1a32d773b3803fda4cec1492babb33a7,440250549b937e7e6f8c6a69de63e57004e5f50f..820ae49b11bf9f82c04f26d63b5192ef4252bf60
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Fri, 01 Jan 2021 14:16:24 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  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 <mitya57@debian.org>  Tue, 16 Nov 2021 12:16:14 +0300
  
  pyside2 (5.15.2-1) unstable; urgency=medium
  

diff --cc debian/rules
index c26119b475041bcdf010e24f5ce69cbc1daba8c7,ccfe66fa476ddfc769b6e63a67d6e1bca8b8a73e..ccfa71d917235468253367e5932d942dd39e6b63
--- 1/debian/rules
--- 2/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