Merge version 5.15.2+dfsg-16+rpi1 and 5.15.4+dfsg-3 to produce 5.15.4+dfsg-3+rpi1

diff --cc configure.json
Simple merge

diff --cc debian/changelog
index c44b1801abdc3f91ab0e51eb4443f7ef69e7c947,caae351e95bc8b60c31cd7c223d80863c3d83612..10826ad8c0fe4c02a49d536a4fa4416888d8078d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,31 +1,41 @@@
- qtbase-opensource-src (5.15.2+dfsg-16+rpi1) bookworm-staging; urgency=medium
++qtbase-opensource-src (5.15.4+dfsg-3+rpi1) bookworm-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, 10 Apr 2022 13:02:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Jun 2022 05:52:37 +0000
 +
- qtbase-opensource-src (5.15.2+dfsg-16) unstable; urgency=medium
+ qtbase-opensource-src (5.15.4+dfsg-3) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 13 Jun 2022 21:00:47 +0300
+ 
+ qtbase-opensource-src (5.15.4+dfsg-2) experimental; urgency=medium
+ 
+   * Install QtXcbQpa private headers needed for deepin-qt5dxcb-plugin,
+     to avoid modifying it for every new Qt version.
+   * Use symver directive to catch all private symbols at once.
+   * Bump Standards-Version to 4.6.1, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 16 May 2022 14:42:53 +0300
+ 
+ qtbase-opensource-src (5.15.4+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches that are included in the new release:
+     - fix-invalid-pointer-return-with-QGridLayout.diff
+     - gcc-11-qtconcurrentthreadengine.diff
+   * Refresh other patches.
+   * Bump ABI version to qtbase-abi-5-15-4.
+   * Update debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 13 May 2022 17:14:31 +0300
+ 
+ qtbase-opensource-src (5.15.3+dfsg-2) experimental; urgency=medium
  
    [ Andrea Pappacoda ]
    * Backport upstream patch to fix qtconcurrentthreadengine.h with GCC 11.

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge