Merge version 5.15.8+dfsg-3+rpi1 and 5.15.8+dfsg-7 to produce 5.15.8+dfsg-7+rpi1

diff --cc debian/changelog
index 579e059d07a08b89794bb57d601529d1963f550f,1e4e4c2c894ef61db2f2cd6204573155223ab76d..64bbc281674641133ab6c7a4132d145ce6669b9b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,30 +1,40 @@@
- qtbase-opensource-src (5.15.8+dfsg-3+rpi1) bookworm-staging; urgency=medium
++qtbase-opensource-src (5.15.8+dfsg-7+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, 12 Mar 2023 16:23:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 13 May 2023 23:05:51 +0000
++
+ qtbase-opensource-src (5.15.8+dfsg-7) unstable; urgency=medium
+ 
+   * Update a11y_root.diff. This time the code waits for Qt loop to process the
+     check (Closes: #1033995, #1034160, #1034271).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Wed, 12 Apr 2023 20:24:34 -0300
+ 
+ qtbase-opensource-src (5.15.8+dfsg-6) unstable; urgency=medium
+ 
+   * Use the new, fixed version of a11y_root.diff from Samuel Thibault
+     (again closes: #1033995).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 11 Apr 2023 14:25:22 +0300
+ 
+ qtbase-opensource-src (5.15.8+dfsg-5) unstable; urgency=medium
+ 
+   * Revert the last upload. Unfortunately, it caused regressions
+     (closes: #1034160, #1034169, #1034191).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 10 Apr 2023 23:58:16 +0300
+ 
+ qtbase-opensource-src (5.15.8+dfsg-4) unstable; urgency=medium
+ 
+   * Add a patch to fix accessibility on XCB when running as root
+     (closes: #1033995).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 09 Apr 2023 21:23:36 +0300
  
  qtbase-opensource-src (5.15.8+dfsg-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 9d9ad62ebb21519e9f5b6a8c0253880c15dac52b,521474ab302676f06314612f2756a0e3d53912a8..85f707c5fe2955722e1fe010e5b44e7b7b821fbc
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -29,4 -29,4 +29,5 @@@ qstorageinfo_linux.dif
  cross_build_mysql.diff
  cast_types_for_egl_x11_test.diff
  revert_startBlocking_removal.diff
+ a11y_root.diff
 +modify-configure.json-to-disable-neon.patch