Merge version 1.21.7+rpi1 and 1.21.8 to produce 1.21.8+rpi1

diff --cc debian/changelog
index c036e15318a073b60ec5fe6d6344364c8992dd37,05cc488a5359752974c9dfba73c586689d24aade..1fe493104dadb2b753f7cb983cfa4640434d1ed8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,34 +1,42 @@@
- dpkg (1.21.7+rpi1) bookworm-staging; urgency=medium
++dpkg (1.21.8+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.20.5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 02 Aug 2020 12:08:02 +0000]
 +  * Hack up Vendor.pm so it doesn't fail
 +    (see https://lists.debian.org/debian-dpkg/2020/08/msg00004.html )
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Apr 2022 08:55:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 May 2022 20:21:55 +0000
++
+ dpkg (1.21.8) unstable; urgency=medium
+ 
+   [ Guillem Jover ]
+   * dpkg-statoverride: Add support for --force-not-root. Closes: #1009069
+     Based on a patch by John Spencer <maillist-dpkg@barfooze.de>.
+   * dpkg: Fix «De-configuring» message to allow configuration to use new
+     version.
+   * Perl modules:
+     - Dpkg::Source::Archive: Prevent directory traversal for in-place extracts.
+       Reported by Max Justicz <max@justi.cz>. Fixes CVE-2022-1664.
+     - Dpkg::Substvars: Add support for optional substvars assigned with ?=.
+   * Documentation:
+     - man: Reference deb-substvar(5) from dpkg-source(1) and dpkg-shlibdeps(1).
+     - man: Structure and clarify deb-substvars(5).
+       Prompted by Niels Thykier <niels@thykier.net>.
+   * Build system:
+     - Unhook dist-cpan from make dist target.
+   * Packaging:
+     - Silence warning about merged-usr-via-aliased-dirs on Ubuntu.
+     - Remove useless [] around tr sets.
+   * Localization:
+     - Update Dutch translations. Closes: #1010031, #1010032, #1010033
+       Thanks to Frans Spiesschaert <Frans.Spiesschaert@yucom.be>.
+     - Update Portuguese man pages translations. Closes: #1011095
+       Thanks to Américo Monteiro <a_monteiro@gmx.com>.
+ 
+   [ Helge Kreutzmann ]
+   * Localization:
+     - Update German man pages translation.
+ 
+  -- Guillem Jover <guillem@debian.org>  Wed, 25 May 2022 10:39:29 +0200
  
  dpkg (1.21.7) unstable; urgency=medium