Merge version 13.8+rpi1 and 13.8+deb13u1 to produce 13.8+rpi1+deb13u1

diff --cc debian/changelog
index 074bcdbd1dc60a52d000162a32af7665283c51ab,674c5719da32519c5b6d25ad6cf95a6e58039bef..8f58f6ac77e5d510ddb9722c4c445d5bea44c13a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (13.8+rpi1) trixie-staging; urgency=medium
++base-files (13.8+rpi1+deb13u1) 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>  Wed, 21 May 2025 16:29:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 12 Sep 2025 22:55:59 +0000
++
+ base-files (13.8+deb13u1) trixie; urgency=medium
+ 
+   * Update debian_version and os-release for Debian 13.1 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 24 Aug 2025 18:20:00 +0200
  
  base-files (13.8) unstable; urgency=medium