From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 21 Sep 2023 23:20:32 +0000 (+0100)
Subject: Merge version 6.3.2-1+rpi1 and 6.4.4-2 to produce 6.4.4-2+rpi1
X-Git-Tag: archive/raspbian/6.4.4-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39542f74ecded079ad211a366862914b5e4759a9;p=mercurial.git

Merge version 6.3.2-1+rpi1 and 6.4.4-2 to produce 6.4.4-2+rpi1
---

39542f74ecded079ad211a366862914b5e4759a9
diff --cc debian/changelog
index e6e7a69,6d8b72c..e5bf0f8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,37 @@@
- mercurial (6.3.2-1+rpi1) bookworm-staging; urgency=medium
++mercurial (6.4.4-2+rpi1) trixie-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2023 19:47:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Sep 2023 23:20:32 +0000
++
+ mercurial (6.4.4-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Remove retired uploader
+ 
+   [ Julien Cristau ]
+   * Skip test-convert-darcs.t and test-convert-svn-branches.t.
+   * Re-enable test-http-bad-server.t (upstream bug was fixed)
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 13 Jul 2023 14:29:24 +0200
+ 
+ mercurial (6.4.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - chg-environ.patch: dropped, fixed upstream
+ 
+  -- Julien Cristau <jcristau@debian.org>  Fri, 16 Jun 2023 15:14:31 +0200
+ 
+ mercurial (6.4.2-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - from_upstream_stable.patch: dropped, already upstream
+     - openssl_3_cipher_tlsv1.patch: dropped, now merged upstream
+     - chg-environ.patch: new patch, fixes chg build failure
+     - proposed_upstream__doctest.path: updated
+ 
+  -- Julien Cristau <jcristau@debian.org>  Tue, 18 Apr 2023 16:23:22 +0200
  
  mercurial (6.3.2-1) sid; urgency=medium