Merge version 5.6.1-2+rpi1 and 5.6.1-4 to produce 5.6.1-4+rpi1

diff --cc debian/changelog
index 80a3c99d56244a4c4b9c1b631163a5cb0262293d,b60fc8a8fd1cad9a48a302846da0f27101af7542..3df403be56fa2e9424fbc0d081ebf712ba6f7d35
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- mercurial (5.6.1-2+rpi1) bullseye-staging; urgency=medium
++mercurial (5.6.1-4+rpi1) bullseye-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, 05 Feb 2021 14:29:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jun 2021 03:23:19 +0000
++
+ mercurial (5.6.1-4) unstable; urgency=medium
+ 
+   * Revert -mno-lra workaround on mips64el, #871514 was fixed. Fixes
+     occasional FTBFS on mips64el.
+ 
+  -- Stefano Rivera <stefanor@debian.org>  Sun, 23 May 2021 08:37:06 -0400
+ 
+ mercurial (5.6.1-3) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Helmut Grohne ]
+   * Annotate test dependencies <!nocheck> (closes: #980337).
+ 
+   [ Stefano Rivera ]
+   * python-3.9.2.patch: Use "&" instead of ";" as query string separator
+     in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
+     urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
+     default. (closes: #986514)
+ 
+  -- Stefano Rivera <stefanor@debian.org>  Fri, 21 May 2021 12:06:47 -0400
  
  mercurial (5.6.1-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge