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

diff --cc debian/changelog
index c8fa1eacf7e5136fba8eb468bb129681c48a66e3,a5f08c2d1cb907d52b6a66ae6842aee3440756e2..074bcdbd1dc60a52d000162a32af7665283c51ab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,23 +1,41 @@@
- base-files (13.7+rpi1) trixie-staging; urgency=medium
++base-files (13.8+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>  Wed, 12 Mar 2025 02:04:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 May 2025 16:29:18 +0000
++
+ base-files (13.8) unstable; urgency=medium
+ 
+   * Changes for trixie as stable:
+   - Use 13 as version in /etc/issue and /etc/issue.net.
+   - Use 13.0 as version in /etc/debian_version.
+   - Update PRETTY_NAME in os-release, now 13 (trixie).
+   - Add VERSION_ID and VERSION.
+   - Add DEBIAN_VERSION_FULL with the same contents as /etc/debian_version.
+     This is only expected to exist on stable releases. Closes: #931197.
+     Note that this does not change the fundamental fact that "all point
+     releases of trixie are Debian 13". This is just a convenience for
+     tools like ansible who already parse both debian_version and os-release
+     so that in the long term they can parse os-release only.
+   - Update README (trixie -> forky and use 13.x for example version).
+   * Refresh some licenses from ftp.gnu.org. Closes: #1103289.
+   * Set Rules-Requires-Root to no.
+   * Drop obsolete debian/2775-dirs.
+   * Add Vcs-Git and Vcs-Browser fields.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 12 May 2025 21:25:00 +0200
  
  base-files (13.7) unstable; urgency=medium
  

diff --cc debian/control
index 82b8b8bda063b67cb19503f09fcfdf44486ff4a9,aa70f72ac340e1f544f12959f6715e091b09370c..d182f48a59c7c4a42634b6562a9a5d17ae45b5f5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,8 -3,10 +3,10 @@@ Section: admi
  Priority: required
  Maintainer: Santiago Vila <sanvila@debian.org>
  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
+ Vcs-Git: https://salsa.debian.org/sanvila/base-files.git
+ Vcs-Browser: https://salsa.debian.org/sanvila/base-files
+ Rules-Requires-Root: no
  
  Package: base-files
  Provides: base, usr-is-merged