Manual merge of version 5.15.10+dfsg-3+rpi1 and 5.15.13+dfsg-2 to produce 5.15.13...

diff --cc debian/changelog
index e62f6e34ba1b22167d2cd586e87f8200f386c8cb,dd3f75bd7a2549e0aa81b4970ae342953fcdc02b..fa0869bf853c05e2c0b86ba14b01edacf7773cbf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,106 +1,116 @@@
- qtbase-opensource-src (5.15.10+dfsg-3+rpi1) trixie-staging; urgency=medium
++qtbase-opensource-src (5.15.13+dfsg-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 17 Sep 2023 03:46:01 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 07 Jun 2024 00:44:36 +0000
++
+ qtbase-opensource-src (5.15.13+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove myself from Uploaders.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 21 May 2024 10:53:43 +0300
+ 
+ qtbase-opensource-src (5.15.13+dfsg-1) experimental; urgency=medium
+ 
+   * Merge 5.15.10+dfsg-7.2 upload from unstable.
+     - Acknowledge NMUs, thanks Benjamin Drung and Steve Langasek!
+   * New upstream release.
+   * Drop patches, included in the new release:
+     - image_deletion_order.diff
+     - qxcbwindow_set_geometry.diff
+     - CVE-2023-24607.diff
+   * Refresh other patches.
+   * Bump ABI version to qtbase-abi-5-15-13.
+   * Update debian/copyright.
+   * Run wrap-and-sort.
+   * Fix Lintian overrides.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 09 Mar 2024 14:24:14 +0300
+ 
+ qtbase-opensource-src (5.15.12+dfsg-3) experimental; urgency=medium
+ 
+   * Merge 5.15.10+dfsg-7 upload from unstable.
+   * Replace pkg-config build-dependency with pkgconf.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 24 Feb 2024 19:39:14 +0300
+ 
+ qtbase-opensource-src (5.15.12+dfsg-2) experimental; urgency=medium
+ 
+   * Merge 5.15.10+dfsg-6 upload from unstable.
+   * Update debian/libqt5gui5.symbols for powerpc.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 14 Jan 2024 13:23:36 +0300
+ 
+ qtbase-opensource-src (5.15.12+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop fix_alt_backtick.diff, included in the new release.
+   * Bump ABI version to qtbase-abi-5-15-12.
+   * Update debian/copyright for src/3rdparty/libpng.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 23 Dec 2023 14:48:57 +0300
+ 
+ qtbase-opensource-src (5.15.11+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches, included in the new release:
+     - openssl_set_options.diff
+     - revert_startBlocking_removal.diff
+   * Refresh other patches.
+   * Bump ABI version to qtbase-abi-5-15-11.
+   * Update debian/copyright.
+   * Override two source-is-missing Lintian warnings.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 14 Nov 2023 18:38:23 +0300
+ 
+ qtbase-opensource-src (5.15.10+dfsg-7.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix extraneous X-Time64-Compat declarations.  Closes: #1065154.
+ 
+  -- Steve Langasek <vorlon@debian.org>  Sun, 03 Mar 2024 09:03:16 +0000
+ 
+ qtbase-opensource-src (5.15.10+dfsg-7.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1062946
+ 
+  -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 23:11:00 +0000
+ 
+ qtbase-opensource-src (5.15.10+dfsg-7) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix potential buffer overflow when reading
+     KTX images (CVE-2024-25580, closes: #1064053).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 17 Feb 2024 15:11:37 +0300
+ 
+ qtbase-opensource-src (5.15.10+dfsg-6) unstable; urgency=medium
+ 
+   * Backport upstream patches to fix incorrect integer overflow check in
+     HPack (CVE-2023-51714, closes: #1060694).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 13 Jan 2024 19:53:52 +0300
+ 
+ qtbase-opensource-src (5.15.10+dfsg-5) unstable; urgency=medium
+ 
+   * Add a patch to support LoongArch (closes: #1054569). Thanks Dandan Zhang!
+   * Add a debian/clean file (closes: #1048743).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 13 Nov 2023 11:21:47 +0300
+ 
+ qtbase-opensource-src (5.15.10+dfsg-4) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix build with libxkbcommon 1.6.0.
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 24 Oct 2023 14:07:10 +0300
  
  qtbase-opensource-src (5.15.10+dfsg-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index f9a8db9f36cb89665ec1f57050853c1072ede1c7,8a1e6cd5e12c77deba638b7af49ef8723d7f8b68..f70889644e62f2e7d7e78f7f06247e9d587a0ac8
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -33,5 -32,3 +32,4 @@@ path_max.dif
  qstorageinfo_linux.diff
  cross_build_mysql.diff
  cast_types_for_egl_x11_test.diff
- revert_startBlocking_removal.diff
 +modify-configure.json-to-disable-neon.patch

diff --cc debian/rules
index 52a7f48c31a8784bcbda29aed958f93c2cbe2e7f,2b5d975b611a34bb274ea1cef460ad177866cebb..738d157f341da45b5b4425b2211f0b1aca5c85e4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -197,15 -177,6 +177,9 @@@ override_dh_auto_clean
        | grep -e application/x-executable \
        | cut -d ':' -f 1 | xargs rm -f
  
-       # Generated on build
-       rm -vf debian/stamp-makefile-build-tools
- 
-       # more leftovers
-       rm -f .device.vars .qmake.vars
- 
 +      # yet more crap
 +      rm -rf doc/q*
 +
  override_dh_auto_build-indep:
        dh_auto_build -- docs