Merge version 1.22.2+rpi1 and 1.22.4 to produce 1.22.4+rpi1

diff --cc debian/changelog
index 52f90146df468156dc4c663a86602824a81787d4,59fc32378bfbf3250790e9a968b184a916d0b863..5540c93404c1a0f0e4ab57390e9afcdc27dd1bca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,67 +1,78 @@@
- dpkg (1.22.2+rpi1) trixie-staging; urgency=medium
++dpkg (1.22.4+rpi1) trixie-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>  Sun, 24 Dec 2023 17:53:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2024 12:34:45 +0000
++
+ dpkg (1.22.4) unstable; urgency=medium
+ 
+   [ Guillem Jover ]
+   * Code internals:
+     - dpkg: Rename r variable for readlink() return value to symlink_len.
+     - dpkg: Rename r variable for fd_read() return value to n.
+     - dpkg-deb: Rename r variable for fd_read() return value to nread.
+     - dpkg-deb: Rename r variables for fd_read() call chain return value to rc.
+     - dpkg-split: Rename r variable for strtoimax() return value to ret.
+     - libdpkg: Rename r variable for path_quote_filename() return to ret.
+     - libdpkg: Rename r variable for fclose() return value to rc.
+     - libdpkg: Rename r variables for printf()-like return values to n.
+     - libdpkg: Handle tar long GNU names and links not being NUL terminated.
+       Closes: #1061404
+     - perl: Use qw() when importing symbols.
+     - dpkg-gensymbols: Move foreach inlined array elements into a list.
+     - dpkg-scansources: Fix newline breaks for ternary operators.
+   * Packaging:
+     - Update copyright years.
+ 
+  -- Guillem Jover <guillem@debian.org>  Wed, 24 Jan 2024 13:12:31 +0100
+ 
+ dpkg (1.22.3) experimental; urgency=medium
+ 
+   [ Guillem Jover ]
+   * dpkg-buildtree: New program.
+   * Perl modules:
+     - Dpkg::Vendor::Debian: Parametrize fortify level.
+     - Dpkg::Vendor::Ubuntu: Default to fortify level 3.
+     - Dpkg::OpenPGP::Backend::SOP: Add reference to another gosop blocker.
+     - Dpkg::OpenPGP::Backend::GnuPG: Accept keybox format keyrings as-is.
+     - Dpkg::OpenPGP::Backend: Remove unused strict_verify option.
+     - Dpkg::OpenPGP::Backend::GnuPG: Look harder for trustedkeys keyring.
+     - Dpkg::Changelog::Debian: Remove wrong import arguments.
+     - Dpkg::Vendor::Debian: Split bug-implicit-func from bug feature in qa
+       area.
+   * Documentation:
+     - man: Use semantic line breaks (must requirements).
+     - man: Remove trailing full stop before parenthetical.
+     - man: Use «package maintainer script» instead of «Debian package
+       scripts».
+   * Code internals:
+     - libcompat: Make long_options array const.
+   * Packaging:
+     - Make the logdir variable local to its function in postrm.
+     - Install start-stop-daemon under /usr/sbin. Closes: #1059982
+     - Make get_vendor honor DEB_VENDOR environment variable.
+     - Check for usrmerge in bug-script on the same vendors as postinst.
+     - Do not install dpkg-fsys-usrunmess on Debian and Ubuntu.
+   * Localization:
+     - Fix L<> markup.
+     - Unfuzzy translations after semantic line break changes.
+     - Update Dutch man pages translation.
+       Thanks to Frans Spiesschaert <Frans.Spiesschaert@yucom.be>.
+       Closes: #1061085
+     - Update Swedish translations.
+       Thanks to Peter Krefting <peter@softwolves.pp.se>. Closes: #1059527
+ 
+   [ Helge Kreutzmann ]
+   * Localization:
+     - Update German man pages translation.
+     - Update German scripts translation.
+ 
+  -- Guillem Jover <guillem@debian.org>  Fri, 19 Jan 2024 12:10:52 +0100
  
  dpkg (1.22.2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge