Merge version 13.6+rpi1 and 13.7 to produce 13.7+rpi1

diff --cc debian/changelog
index 42ffdb292966a062891887cef141eb46114adeb4,b04601a0d254e95f2f7864d12d28621348fee3f5..c8fa1eacf7e5136fba8eb468bb129681c48a66e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,12 +1,30 @@@
- base-files (13.6+rpi1) trixie-staging; urgency=medium
++base-files (13.7+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>  Tue, 10 Dec 2024 15:23:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Mar 2025 02:04:29 +0000
++
+ base-files (13.7) unstable; urgency=medium
+ 
+   * Make /var/local to be root:root and 755 by default on new installs.
+     On upgrades from Debian 12, the permissions of /var/local are kept,
+     which is what we want for backwards compatibility. Closes: #1039973.
+   * Raise Standards-Version to 4.7.2.
+   * Add debian/salsa-ci.yml.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Tue, 04 Mar 2025 12:20:00 +0100
  
  base-files (13.6) unstable; urgency=medium
  

diff --cc debian/control
index c0368dfaceed011a6d5a521f85fa4fed9488a1fc,3a3b75e37e2f5481f040f946953eaa1ad7f48529..82b8b8bda063b67cb19503f09fcfdf44486ff4a9
--- 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.7.0
+ Standards-Version: 4.7.2
 -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

diff --cc debian/rules
Simple merge