Merge version 1.22.1-1+rpi1 and 1.22.1-2 to produce 1.22.1-2+rpi1

diff --cc debian/changelog
index cf0373cec81676a128833bc0deb7aa03d18391f7,3d7a1d003515ede0dfc9326c6c9306f09866339b..6eb2e801f2b9c83789a59b3655259bff5c7a2235
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,9 +1,31 @@@
- qbs (1.22.1-1+rpi1) bookworm-staging; urgency=medium
++qbs (1.22.1-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, 12 May 2022 13:44:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 May 2022 00:20:23 +0000
++
+ qbs (1.22.1-2) unstable; urgency=medium
+ 
+   * Mark some symbols as optional (closes: #1010755).
+   * Bump Standards-Version to 4.6.1, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 15 May 2022 14:05:37 +0300
  
  qbs (1.22.1-1) unstable; urgency=medium