Merge version 5.9.3-1+rpi1 and 6.0.1-1 to produce 6.0.1-1+rpi1

diff --cc debian/changelog
index d11be5a919d73d9e1e92b4e2ebf422ba1c6ebd8d,88e7ed1a64194686a275463b8f6e813f0e2e22e7..f3ca768e2fbe40ea7a3c82927b23264a6934d260
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- mercurial (5.9.3-1+rpi1) bookworm-staging; urgency=medium
++mercurial (6.0.1-1+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>  Thu, 11 Nov 2021 22:17:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 21:37:37 +0000
++
+ mercurial (6.0.1-1) unstable; urgency=medium
+ 
+   * Add Raphaël Gomès' key to the known set.
+   * New upstream release.
+     + deb_specific__test_zstd_s390x.patch: dropped, merged upstream
+   * Upload to unstable.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Thu, 06 Jan 2022 10:16:00 +0100
+ 
+ mercurial (6.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Julien Cristau <jcristau@debian.org>  Tue, 23 Nov 2021 20:37:36 +0100
+ 
+ mercurial (6.0~rc0-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Wed, 10 Nov 2021 13:12:13 +0100
  
  mercurial (5.9.3-1) unstable; urgency=medium