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

diff --cc debian/changelog
index 6eb2e801f2b9c83789a59b3655259bff5c7a2235,cef26d419dff90147996b9e7bae4f01f15758da5..830fc4ec15f0f1c86c74050102d8e60a851647da
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,24 +1,46 @@@
- qbs (1.22.1-2+rpi1) bookworm-staging; urgency=medium
++qbs (1.23.1-1+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>  Sat, 21 May 2022 00:20:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Aug 2022 09:36:38 +0000
++
+ qbs (1.23.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add a patch to link with atomic library when using address sanitizer,
+     to fix test failure on armel (see #1016041).
+   * Update debian/libqbscore1.23.symbols from buildds’ logs.
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 15 Aug 2022 14:41:45 +0300
+ 
+ qbs (1.23.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop cmake_regex_syntax.diff, applied upstream.
+   * Refresh test_sanitizers_only_on_amd64.diff.
+   * Rename libqbscore1.22 to libqbscore1.23 for upstream SONAME change.
+   * Install one new file (asan.qbs).
+   * Update debian/libqbscore1.23.symbols for GCC 12 (closes: #1013020).
+   * Do not build documentation in build-arch target (closes: #1011159).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 24 Jul 2022 23:38:44 +0300
  
  qbs (1.22.1-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge