From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 28 May 2022 18:32:52 +0000 (+0100)
Subject: Merge version 6.1.1-1+rpi1 and 6.1.2-1 to produce 6.1.2-1+rpi1
X-Git-Tag: archive/raspbian/6.1.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ec19bd4128b6521cc8459218bf701b7ad227b578;p=mercurial.git

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

ec19bd4128b6521cc8459218bf701b7ad227b578
diff --cc debian/changelog
index 0a4d9ed,6cc9bc0..b9e567f
--- a/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