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

diff --cc debian/changelog
index ea4cf3c5e8ab27422181dd0aa0319ae9a5fb05d1,95e756068c49c3e75eb6625ae14cf8873f0c93f3..42ffdb292966a062891887cef141eb46114adeb4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (13.5+rpi1) trixie-staging; urgency=medium
++base-files (13.6+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>  Sat, 17 Aug 2024 22:04:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 10 Dec 2024 15:23:20 +0000
++
+ base-files (13.6) unstable; urgency=medium
+ 
+   * Change default dot.profile to not use mesg anymore. Closes: #1088011.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 22 Nov 2024 15:40:00 +0100
  
  base-files (13.5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge