Merge version 1.2.3+ds1-2+rpi1 and 1.3.1+ds1-1 to produce 1.3.1+ds1-1+rpi1

diff --cc debian/changelog
index 2f7eac347851b9a9386da588a3876d59a8476654,7f5b94eec0618476d16a26f2a7c2e782ca13a057..0cbf940b7c12ec4b9a587009a5edc1dd552cbc33
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- zchunk (1.2.3+ds1-2+rpi1) bookworm-staging; urgency=medium
++zchunk (1.3.1+ds1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.1.7+ds1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 20 Jan 2021 20:50:57 +0000]
 +  * Disable testsuite, it seems to fail on arm64 kernels.
 +
-  -- Peter Michael Green <plugwash@rasbian.org>  Tue, 14 Mar 2023 01:56:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Sep 2023 05:24:36 +0000
++
+ zchunk (1.3.1+ds1-1) unstable; urgency=medium
+ 
+   * Use debhelper compat level 14 for `meson install`.
+   * New upstream release:
+     - Closes: #1037423
+     - drop the upstream-zstd-1.5.4 patch, it was taken from upstream
+     - add another minor correction to the typos patch
+     - refresh the line numbers in the cppcheck patch
+ 
+  -- Peter Pentchev <roam@debian.org>  Sat, 01 Jul 2023 19:49:56 +0300
  
  zchunk (1.2.3+ds1-2) unstable; urgency=medium