Merge version 5.15.4+dfsg-5+rpi1 and 5.15.6+dfsg-2 to produce 5.15.6+dfsg-2+rpi1

diff --cc debian/changelog
index dc9eeda2906bccb2d8c9d17a98c40673b82b2e07,a1def8e918119d680c6facf1a33af58bd2bf80a2..a6b9b0a9dd00a07da25c14aafde2a640106568d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,58 +1,68 @@@
- qtbase-opensource-src (5.15.4+dfsg-5+rpi1) bookworm-staging; urgency=medium
++qtbase-opensource-src (5.15.6+dfsg-2+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>  Sat, 13 Aug 2022 04:53:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 30 Oct 2022 20:03:40 +0000
++
+ qtbase-opensource-src (5.15.6+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 29 Sep 2022 11:41:52 +0300
+ 
+ qtbase-opensource-src (5.15.6+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches that are included in the new release:
+     - fix-misplacement-of-placeholder-text-in-QLineEdit.diff
+     - fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
+     - mysql_remove_version_checks.diff
+     - full_width_selection_rtl.diff
+     - xcb_add_a_timeout_control_when_reading_INCR_property.diff
+     - CVE-2021-38593.diff
+     - moc_handle_include.diff
+     - remove_limit_on_number_of_streams.diff
+   * Update symbols files from buildds’ and current build logs.
+   * Revert removal of QtConcurrent::ThreadEngineBase::startBlocking(),
+     which is part of public API and used in the wild.
+   * Bump ABI version to qtbase-abi-5-15-6.
+   * Update debian/copyright (automatically and manually).
+   * Exclude chip.debug compiled binary from the tarball.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 11 Sep 2022 11:44:12 +0300
+ 
+ qtbase-opensource-src (5.15.5+dfsg-3) experimental; urgency=medium
+ 
+   * Merge 5.15.4+dfsg-5 upload from unstable.
+   * Update Lintian overrides.
+   * Update symbols files from buildds' logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 09 Aug 2022 16:08:10 +0300
+ 
+ qtbase-opensource-src (5.15.5+dfsg-2) experimental; urgency=medium
+ 
+   * Restore CVE-2021-38593.diff, 3 of 4 commits are still applicable.
+   * Update symbols files from buildds’ logs.
+   * Backport upstream patch to remove limit on the number of HTTP/2 streams.
+     Fixes https://bugs.kde.org/show_bug.cgi?id=455540.
+   * Update debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 20 Jun 2022 23:37:04 +0300
+ 
+ qtbase-opensource-src (5.15.5+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Bump ABI version to 5.15.5.
+   * Remove reverse-applicable upstream patches:
+     - gcc_11_limits.diff
+     - CVE-2021-38593.diff
+   * Refresh existing patches.
+ 
+  -- Simon Quigley <tsimonq2@debian.org>  Fri, 17 Jun 2022 22:08:50 -0500
  
  qtbase-opensource-src (5.15.4+dfsg-5) unstable; urgency=medium
  

diff --cc debian/patches/series
index dbf67a7900054a6df8c3a7b0e9951b4fc8d3377a,b39fddc98828ec42af08d0677a60cb256b1948ae..994f17516f4682d84170ba95a68bcd7b79777a0c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -29,4 -20,4 +20,5 @@@ 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