Merge version 6.2.3-1+rpi1 and 6.3.1-2 to produce 6.3.1-2+rpi1

diff --cc debian/changelog
index 665e7abd5fa32e2213ac829e54a52772a0c38fc9,4c77d842221e69b1676c4226d97d9d02e09c4e7a..9c0a09d827695f499137073b3996be2d05c84684
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- mercurial (6.2.3-1+rpi1) bookworm-staging; urgency=medium
++mercurial (6.3.1-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Oct 2022 15:13:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Dec 2022 23:11:07 +0000
++
+ mercurial (6.3.1-2) sid; urgency=medium
+ 
+   * Fix FTBFS on 32-bit (closes: #1025621)
+ 
+  -- Julien Cristau <jcristau@debian.org>  Wed, 07 Dec 2022 13:59:55 +0100
+ 
+ mercurial (6.3.1-1) sid; urgency=medium
+ 
+   * New upstream release
+     - add python3-packaging to build-deps and autopkgtest dependencies for
+       run-tests, replacing
+       py310/2_run_tests__silence_distutils_deprecation_warning.patch
+   * test-hghave-testrepo.patch: new patch, to make test-hghave.t pass outside a
+     hg repo.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Tue, 06 Dec 2022 11:57:31 +0100
  
  mercurial (6.2.3-1) sid; urgency=medium