Manual merge of version 5.15.0-3+rpi1 and 5.15.0-5 to produce 5.15.0-5+rpi1

diff --cc debian/changelog
index 73d82ea05cd4d07a049394dcd89ef1fe82ed8679,49a217b87befcb369f4db1bf3597043ce75b3927..6c18cc0764eb010b285f6be872228f7be78baede
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,17 +1,28 @@@
- pyside2 (5.15.0-3+rpi1) bullseye-staging; urgency=medium
++pyside2 (5.15.0-5+rpi1) bullseye-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, 17 Jul 2020 08:34:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 14:48:23 +0000
++
+ pyside2 (5.15.0-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * Run tests with QSG_NO_DEPTH_BUFFER=1 on mips64el (see #868745).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 19 Oct 2020 21:50:57 +0300
+ 
+ pyside2 (5.15.0-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Drop preload-libglx-mesa.patch, not needed with glibc ≥ 2.31-1.
+   * Backport upstream patch to add support for Python 3.9 (closes: #972194).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 15 Oct 2020 20:06:52 +0300
  
  pyside2 (5.15.0-3) unstable; urgency=medium
  

diff --cc debian/rules
index 7db23ad40c48fc2b301fed03c09ba0311b1dc6a7,1e6101eba866fb5814dff3e1606abcc47ed4def0..e5ada745f5978f378ec77bcdd5986f9fabf75b85
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -56,11 -56,10 +56,16 @@@ 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:
 -      QSG_NO_DEPTH_BUFFER=1 xvfb-run python3 testrunner.py test
+ ifeq (mips64el,$(DEB_HOST_ARCH))
+       # See https://bugs.debian.org/868745
 -      xvfb-run python3 testrunner.py test
++      #QSG_NO_DEPTH_BUFFER=1 xvfb-run python3 testrunner.py test
+ else
 +      #xvfb-run python3 testrunner.py test
+ endif