Merge version 1.21.21+rpi1 and 1.21.22 to produce 1.21.22+rpi1

diff --cc debian/changelog
index 9afe144616f843d6038b0a6353295edc9f8fc41e,d0d28f920303ba1417914782f2bf7caf6805e591..88ffaaf226a21fee67439b1148023a76fd03c47c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,14 +1,25 @@@
- dpkg (1.21.21+rpi1) bookworm-staging; urgency=medium
++dpkg (1.21.22+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 )
 +
 +  [changes introduce in 1.21.17+rpi1 by Peter Michael Green]
 +  * disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Mar 2023 11:46:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 02 Jun 2023 07:43:27 +0000
++
+ dpkg (1.21.22) unstable; urgency=medium
+ 
+   [ Guillem Jover ]
+   * Code internals:
+     - libdpkg: Handle missing Version when formatting source:Upstream-Version.
+       Reported by John Scott <jscott@posteo.net>.
+   * Localization:
+     - Add Portuguese scripts translations.
+       Thanks to Américo Monteiro <a_monteiro@gmx.com>. Closes: #1032562
+ 
+  -- Guillem Jover <guillem@debian.org>  Thu, 11 May 2023 04:04:01 +0200
  
  dpkg (1.21.21) unstable; urgency=medium