Merge version 1.1.16+ds1-1+rpi1 and 1.2.1+ds1-1 to produce 1.2.1+ds1-1+rpi1

diff --cc debian/changelog
index 493ab78bb00b4a387d390fb02c209f3ba7490a70,73e14667664cfddd0248005626bde1104ad3c075..9e3f1dcb1fcf8afccf414477aca1ed8211a8366d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- zchunk (1.1.16+ds1-1+rpi1) bookworm-staging; urgency=medium
++zchunk (1.2.1+ds1-1+rpi1) bookworm-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Aug 2021 12:50:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 17:28:38 +0000
++
+ zchunk (1.2.1+ds1-1) unstable; urgency=medium
+ 
+   * Add the test-checksums patch to fix the test suite with versions
+     1.4.10 and 1.5.0 of libzstd. Closes: #1009427
+   * Add the year 2022 to my debian/* copyright notice.
+   * New upstream release (Closes: #1006195):
+     - drop the cppcheck patch, integrated upstream
+     - drop most of the chunks in the test-checksums patch (they were taken
+       from the 1.2.x source), only leaving the one handling the difference
+       between libzstd-1.4.10 and libzstd-1.5.0
+     - update the symbols file
+ 
+  -- Peter Pentchev <roam@debian.org>  Fri, 15 Apr 2022 11:48:24 +0300
  
  zchunk (1.1.16+ds1-1) unstable; urgency=medium