Merge version 5.6.1-4+rpi1 and 5.9-3 to produce 5.9-3+rpi1

diff --cc debian/changelog
index 3df403be56fa2e9424fbc0d081ebf712ba6f7d35,7e440d8e66eccb400768833e226bc2279bb8a2aa..e7a20b5b64be3144512841cec61bd97c17c333a8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,35 @@@
- mercurial (5.6.1-4+rpi1) bullseye-staging; urgency=medium
++mercurial (5.9-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 10:30:51 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jun 2021 03:23:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Sep 2021 09:22:01 +0000
++
+ mercurial (5.9-3) unstable; urgency=medium
+ 
+   * Further adjust tests for endianness-related variations.
+   * Silence yet another test warning about `which`.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Wed, 25 Aug 2021 19:54:04 +0200
+ 
+ mercurial (5.9-2) unstable; urgency=medium
+ 
+   * Fix bugs in revlog parsing causing issues on s390x, and adjust some
+     tests to accept variations in zstd output.  Closes: #992844.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Wed, 25 Aug 2021 17:22:58 +0200
+ 
+ mercurial (5.9-1) unstable; urgency=medium
+ 
+   [ Nicolas Dandrimont ]
+   * New upstream release.
+     - Add OpenPGP key for Pulkit Goyal <7895pulkit@gmail.com>.
+     - Refresh patches.
+ 
+   [ Julien Cristau ]
+   * Silence warnings from `which` in tests.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Mon, 23 Aug 2021 17:04:40 +0200
  
  mercurial (5.6.1-4) unstable; urgency=medium