Merge version 3.9.2-1+rpi1 and 3.9.7-2 to produce 3.9.7-2+rpi1

diff --cc debian/changelog
index 3e002b9568445e8e14edbf5bb94b4b43e473f820,3baf5a7bf3aeda876729df6a4da4a300e95bdd73..214fc1d93dd4d609eacaeeab425542ea665cd0dd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,80 +1,87 @@@
- python3.9 (3.9.2-1+rpi1) bullseye-staging; urgency=medium
++python3.9 (3.9.7-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 3.9.0~b5-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 30 Jul 2020 10:10:07 +0000]
 +  * Disable testsuite (test_concurrent_futures seems to hang)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 12 Mar 2021 04:06:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Sep 2021 00:49:47 +0000
++
+ python3.9 (3.9.7-2) unstable; urgency=medium
+ 
+   * Fix CFLAGS in the python3.x-config scripts. Closes: #992669, #989000.
+   * Support arc-linux-gnu in the multiarch header. Closes: #992091.
+   * Don't run the test_concurrent_futures test on alpha and sparc64.
+     Closes: #991110.
+   * Fix path to mkdir on a unified-/usr system. Closes: #992775.
+   * Use command -v instead of which in shell scripts. Closes: #993413.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 03 Sep 2021 08:18:44 +0200
+ 
+ python3.9 (3.9.7-1) unstable; urgency=medium
+ 
+   * Python 3.9.7 release.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 31 Aug 2021 15:27:14 +0200
+ 
+ python3.9 (3.9.6-1) experimental; urgency=medium
+ 
+   * Python 3.9.6 release.
+   * Refresh patches.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 29 Jun 2021 12:19:25 +0200
+ 
+ python3.9 (3.9.5-3) experimental; urgency=medium
+ 
+   * Tighten python3-tk autopkg test dependency.
+   * Try to detect whether python3-venv is missing (Stefano Rivera).
+     Closes: #977887.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 11 May 2021 08:26:08 +0200
+ 
+ python3.9 (3.9.5-2) experimental; urgency=medium
+ 
+   * Re-add the dependency on libdb-dev.  With Python 3.10, building
+     the _dbm extension using libgdbm-compat-dev, and moving the _dbm
+     extension into the python3-gdbm package.
+   * Call python with -S when checking the minimal set of modules.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 06 May 2021 11:11:34 +0200
+ 
+ python3.9 (3.9.5-1) experimental; urgency=medium
+ 
+   * Python 3.9.5 release.
+   * Refresh patches.
+   * Drop the unused build dependency on libdb-dev.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 04 May 2021 06:08:53 +0200
+ 
+ python3.9 (3.9.4-1) experimental; urgency=medium
+ 
+   * Python 3.9.4 release.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 04 Apr 2021 21:38:44 +0200
+ 
+ python3.9 (3.9.3-2) experimental; urgency=high
+ 
+   * Fix flags substitutions for _sysconfigdata.
+   * Revert the fix for issue #42500, breaking ABI on 32bit architectures.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 04 Apr 2021 11:36:06 +0200
+ 
+ python3.9 (3.9.3-1) experimental; urgency=medium
+ 
+   * Python 3.9.3 release.
+     - Fix issue #42988: CVE-2021-3426: Remove the getfile feature of the
+       pydoc module which could be abused to read arbitrary files on the
+       disk (directory traversal vulnerability).
+     - Other security issues without a CVE.
+     - Other fixes. See the NEWS file.
+   * Move zlib1g-dev dependency to libpython3.9-dev. Closes: #984580.
+   * Configure with --libdir=/usr/lib/$(DEB_HOST_MULTIARCH), recording the
+     correct LIBDIR in _sysconfigdata.  Also adjust DESTSHARED to install
+     lib-dynload into the same location as before the configure change.
+     See issue #43229.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 03 Apr 2021 11:27:11 +0200
  
  python3.9 (3.9.2-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge