From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 23 Jan 2021 13:59:57 +0000 (+0000)
Subject: Merge version 5.5.2-1+rpi1 and 5.6.1-1 to produce 5.6.1-1+rpi1
X-Git-Tag: archive/raspbian/5.6.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=75b0700d8a1dfc3a81acd6e30b60b29f2ab90a7b;p=mercurial.git

Merge version 5.5.2-1+rpi1 and 5.6.1-1 to produce 5.6.1-1+rpi1
---

75b0700d8a1dfc3a81acd6e30b60b29f2ab90a7b
diff --cc debian/changelog
index c996516,e9db5f9..822a53e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- mercurial (5.5.2-1+rpi1) bullseye-staging; urgency=medium
++mercurial (5.6.1-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 13 Dec 2020 10:30:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 23 Jan 2021 13:59:56 +0000
++
+ mercurial (5.6.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Uploaders: remove vicho and vdanjean, add jcristau.  With
+     thanks for their past contributions!
+ 
+  -- Julien Cristau <jcristau@debian.org>  Fri, 08 Jan 2021 17:16:53 +0100
  
  mercurial (5.5.2-1) unstable; urgency=medium