Merge version 1.24.0+dfsg-2+rpi1 and 1.24.0+dfsg-4 to produce 1.24.0+dfsg-4+rpi1

diff --cc debian/changelog
index a941f20ade10f3e529f7685d18293377120f8bf8,d8b71b8b6e7450699f3a8e2e307043b8fd288721..ac2a1286ca60c54ff8a43c52a417291ba08ed086
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,19 +1,41 @@@
- qbs (1.24.0+dfsg-2+rpi1) bookworm-staging; urgency=medium
++qbs (1.24.0+dfsg-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green]
 +  * Mark another symbol as optional. I'm guessing the presence or absesne of
 +    this one depends on optimisation descisions by the compiler and/or the
 +    version of libstdc++
 +
 +  [changes introduced in 1.13.1-2+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack.
 +
 +  [changes introduced in 1.22.0-4+rpi1 by Peter Michael Green]
 +  * Further extend symbols file hack.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Dec 2022 00:58:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 11:57:19 +0000
++
+ qbs (1.24.0+dfsg-4) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Team upload.
+   * Update symbols from buildlogs (Closes: #1027474).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 02 Jan 2023 00:39:26 +0100
+ 
+ qbs (1.24.0+dfsg-3) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Team upload.
+   * Adjust Qt 6 B-Ds to account for renaming.
+   * Update symbols from buildlogs (Closes: #1027474).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sun, 01 Jan 2023 14:25:13 +0100
  
  qbs (1.24.0+dfsg-2) unstable; urgency=medium