Merge version 6.1.1-1+rpi1 and 6.1.2-1 to produce 6.1.2-1+rpi1

diff --cc debian/changelog
index 0a4d9ed74496ff143c64856c7e58ce5d095b9230,6cc9bc09f7658d392b05d024fb3a538272e79762..b9e567f78c2d2b96d7d5e0332c230faf5a0b6207
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- mercurial (6.1.1-1+rpi1) bookworm-staging; urgency=medium
++mercurial (6.1.2-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 22:42:37 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 21 Apr 2022 22:42:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 May 2022 18:32:52 +0000
++
+ mercurial (6.1.2-1) sid; urgency=medium
+ 
+   * Add zsh_completion to debian/copyright (closes: #1004341)
+   * New upstream bugfix release
+   * Fix test failures with openssl 3 (closes: #1011076)
+ 
+  -- Julien Cristau <jcristau@debian.org>  Mon, 23 May 2022 12:21:07 +0200
  
  mercurial (6.1.1-1) sid; urgency=medium