Manual merge of version 5.15.11-1+rpi1 and 5.15.14-1 to produce 5.15.14-1+rpi1

diff --cc debian/changelog
index 3ed1f871c116b6f368cc7ca93f394c274a0fd20c,9692622e2bf8cb2b6edbaa69260db8767441a8ec..a82d94708f43a7e914cf46709b8a364afd873980
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,84 +1,100 @@@
- pyside2 (5.15.11-1+rpi1) trixie-staging; urgency=medium
++pyside2 (5.15.14-1+rpi1) trixie-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.
 +
 +  [changes brought forward from 5.15.2-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> 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 <root@raspbian.org>  Fri, 27 Oct 2023 00:05:40 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 30 Jul 2024 00:03:58 +0000
++
+ pyside2 (5.15.14-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Drop patches, included in the new release:
+     - shiboken2-Fix-build-with-clang-16.patch
+     - shiboken2-Fail-template-test-instead-of-crashing.patch
+   * Refresh and rebase other patches.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 25 Jun 2024 23:47:03 +0300
+ 
+ pyside2 (5.15.13-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Acknowledge NMU, thanks Steve Langasek!
+   * New upstream release.
+   * Rebase patches for the new release.
+   * Blacklist smart_pointer test (closes: #1068078).
+   * Bump Standards-Version to 4.7.0, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 14 Apr 2024 23:48:11 +0300
+ 
+ pyside2 (5.15.12-6.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1064292
+ 
+  -- Steve Langasek <vorlon@debian.org>  Sat, 02 Mar 2024 00:27:01 +0000
+ 
+ pyside2 (5.15.12-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * Build with the default LLVM version (16), to fix dep-wait on mips64el.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 08 Feb 2024 11:13:11 +0300
+ 
+ pyside2 (5.15.12-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport 9 upstream patches for LLVM ≥ 16 support.
+   * Modify sendCommand signatures to use 0 as default value.
+   * Build with llvm-toolchain-17 (closes: #1061206).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 04 Feb 2024 17:20:57 +0300
+ 
+ pyside2 (5.15.12-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Make the tests non-fatal on mips64el (see #1061679).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 28 Jan 2024 19:34:21 +0300
+ 
+ pyside2 (5.15.12-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream change to stop using imp module.
+   * Do not use patchelf to change RPATH, not needed in Debian.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 25 Jan 2024 15:19:52 +0300
+ 
+ pyside2 (5.15.12-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream patches to support Python 3.12.
+   * Blacklist registry::existence_test. It was never actually run, but
+     Python 3.12 started considering it a failure when all tests are skipped.
+   * Build with bundled patchelf on mips64el again.
+     - Restore update-patchelf.patch which was removed in 5.15.2-1~exp1.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 24 Jan 2024 23:46:56 +0300
+ 
+ pyside2 (5.15.12-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Drop make-wheels-compatible-with-Python-3.11.patch, included in the
+     new release.
+   * Fix a bug in test_install_python3.sh because of which the test did
+     not do anything. Thanks Stuart Prescott!
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 20 Jan 2024 21:52:44 +0300
  
  pyside2 (5.15.11-1) unstable; urgency=medium
  

diff --cc debian/control
index 937adc7bed470e66810495e9893acbb80e90e5ed,8f224450865e8727233a4174d860f41a45323f53..f9805ba940d33d3ca3ef33db06afa9d90f1348cf
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -55,13 -55,11 +55,13 @@@ Build-Depends: chrpath
                 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.6.2
+ Standards-Version: 4.7.0
  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

diff --cc debian/rules
index 898c45d831ad0a3409e6f9b41fcc9c08f3af16bc,e859103ea0fffd834296699efe0e569731599fcf..5806ec0dee6e8b15e2b27e71986b498dba3ae9a5
--- 1/debian/rules
--- 2/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))
-       # See https://bugs.debian.org/868745
-       #QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
+       # 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