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

diff --cc debian/changelog
index ac2a1286ca60c54ff8a43c52a417291ba08ed086,a7ecfc3c0da61aced8c0106b985102f03d8c3343..a4f7aa674c7606de144c5791b931462c452a1d4d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,17 +1,39 @@@
- qbs (1.24.0+dfsg-4+rpi1) bookworm-staging; urgency=medium
++qbs (1.24.1+dfsg-2+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>  Thu, 19 Jan 2023 11:57:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 14 May 2023 18:11:07 +0000
++
+ qbs (1.24.1+dfsg-2) unstable; urgency=medium
+ 
+   * Add a patch to find qdoc directly, to fix arch:all build.
+   * Prevent dh_compress from compressing qbs.qch.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 05 Mar 2023 20:28:50 +0300
+ 
+ qbs (1.24.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream bugfix release.
+   * Mark some symbols that disappear with -O3 as optional.
+   * Bump Standards-Version to 4.6.2, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 04 Mar 2023 21:02:25 +0300
  
  qbs (1.24.0+dfsg-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge