Merge version 13.3+rpi1 and 13.5 to produce 13.5+rpi1

diff --cc debian/changelog
index 2065ed962e68c23928ed30969ef2a203baba267f,5974f99221e9162ec10f2b884be5aa23b683a524..ea4cf3c5e8ab27422181dd0aa0319ae9a5fb05d1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,22 +1,40 @@@
- base-files (13.3+rpi1) trixie-staging; urgency=medium
++base-files (13.5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +  [changes introduced in 10.3+rpi1 by Peter Michael Green]
 +  * Make further changes in debian/rules rather than directly to files in
 +    package to further avoid merge conflicts.
 +  * Make changes in debian/rules in the "install" step to avoid the need for
 +    code to revert them.
 +  * Add build-dependency on moreutils to support new code in debian/rules.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Jun 2024 10:20:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Aug 2024 22:04:52 +0000
++
+ base-files (13.5) unstable; urgency=medium
+ 
+   [ Chris Hofstaedtler ]
+   * Fix typo in preinst: lib64 -> libx32. Closes: #1077863.
+   [ Helmut Grohne ]
+   * Work around /lib64 link created by systemd-nspawn. Closes: #1077866.
+   [ Santiago Vila ]
+   * Add lintian overrides for the directories that have become symlinks.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 04 Aug 2024 23:30:00 +0200
+ 
+ base-files (13.4) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Tighten the merged-/usr preinst check. Closes: #1076491.
+   [ Santiago Vila ]
+   * Raise Standards-Version to 4.7.0.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Thu, 01 Aug 2024 12:30:00 +0200
  
  base-files (13.3) unstable; urgency=medium
  

diff --cc debian/control
index 05f674276859977a33de343fa4c21d0720e832d8,8262403a644b085df67e330e0f022d1d4f3931c9..c0368dfaceed011a6d5a521f85fa4fed9488a1fc
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,8 -2,8 +2,8 @@@ Source: base-file
  Section: admin
  Priority: required
  Maintainer: Santiago Vila <sanvila@debian.org>
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
 -Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~)
 +Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~), moreutils
  Rules-Requires-Root: binary-targets
  
  Package: base-files