Manual merge of version 1.2.1+ds1-1+rpi1 and 1.2.3+ds1-2 to produce 1.2.3+ds1-2+rpi1

diff --cc debian/changelog
index 9e3f1dcb1fcf8afccf414477aca1ed8211a8366d,e65fd2a92e4af8620165c2e6e1a677542c0498de..2f7eac347851b9a9386da588a3876d59a8476654
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,42 @@@
- zchunk (1.2.1+ds1-1+rpi1) bookworm-staging; urgency=medium
++zchunk (1.2.3+ds1-2+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>  Mon, 18 Apr 2022 17:28:38 +0000
++ -- Peter Michael Green <plugwash@rasbian.org>  Tue, 14 Mar 2023 01:56:06 +0000
++
+ zchunk (1.2.3+ds1-2) unstable; urgency=medium
+ 
+   * Add the upstream-zstd-1.5.4 patch to make the test suite pass
+     against libzstd-1.5.4. Closes: #1031485
+ 
+  -- Peter Pentchev <roam@debian.org>  Wed, 22 Feb 2023 11:31:17 +0200
+ 
+ zchunk (1.2.3+ds1-1) unstable; urgency=medium
+ 
+   * Declare compliance with Policy 4.6.2 with no changes.
+   * Add the year 2023 to my debian/* copyright notice.
+   * New upstream release:
+     - drop a hunk from the cppcheck patch
+     - refresh the line numbers in the typos patch
+ 
+  -- Peter Pentchev <roam@debian.org>  Thu, 05 Jan 2023 23:49:37 +0200
+ 
+ zchunk (1.2.2+ds1-1) unstable; urgency=medium
+ 
+   * Declare compliance with Policy 4.6.1 with no changes.
+   * Add the cppcheck patch to fix some minor issues.
+   * Do some Python programming style clean-up on the autopkgtest:
+     - reformat the source using 100 characters per line
+     - bump the minimum supported Python version to 3.7
+     - move some checkers' options to pyproject.toml and setup.cfg
+     - push the source down into a debian/tests/python/ subdirectory
+   * Add an EditorConfig definitions file for debian/*.
+   * New upstream version:
+     - drop the test-checksums patch, integrated upstream
+     - refresh the line numbers in the cppcheck patch
+ 
+  -- Peter Pentchev <roam@debian.org>  Fri, 12 Aug 2022 16:57:41 +0300
  
  zchunk (1.2.1+ds1-1) unstable; urgency=medium
  

diff --cc debian/rules
index 2ee1848886f29170a453ae3e8a7812f2f1d85df6,6c4ab90903bdc74beaee5a9773101bac7eed0bac..4b95cb4438f337919d34b7c3b9f8c9af30b98a98
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -12,12 -12,9 +12,12 @@@ GARCH:=     $(shell dpkg-architecture -qDEB
  override_dh_auto_configure:
        dh_auto_configure -- -Dwith-openssl=disabled
  
 -execute_after_dh_auto_test:
 -      env PYTHONPATH=debian/tests/python python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f '/usr/share/dict/american-english'
 -      env PYTHONPATH=debian/tests/python python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f "$$(readlink -f -- "$$(command -v gcc)")"
 +override_dh_auto_test:
 +      echo testsuite disabled
 +
 +#execute_after_dh_auto_test:
- #     env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f '/usr/share/dict/american-english'
- #     env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f "$$(readlink -f -- "$$(command -v gcc)")"
++#     env PYTHONPATH=debian/tests/python python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f '/usr/share/dict/american-english'
++#     env PYTHONPATH=debian/tests/python python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f "$$(readlink -f -- "$$(command -v gcc)")"
  
  override_dh_makeshlibs:
        dh_makeshlibs -- -c4