Merge version 12.4+rpi1+deb12u6 and 12.4+deb12u7 to produce 12.4+rpi1+deb12u7

diff --cc debian/changelog
index ee53cea12535301ebcfe3739bc4ba305c236d81c,76dae59ee3fd3a18f3816c45bec7769118e1159f..fa088864e6aa393c3fd4563ff6029b94c0f29284
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (12.4+rpi1+deb12u6) bookworm-staging; urgency=medium
++base-files (12.4+rpi1+deb12u7) bookworm-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>  Mon, 01 Jul 2024 02:23:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Sep 2024 00:44:45 +0000
++
+ base-files (12.4+deb12u7) bookworm; urgency=medium
+ 
+   * Change /etc/debian_version to 12.7, for Debian 12.7 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Wed, 14 Aug 2024 18:10:00 +0200
  
  base-files (12.4+deb12u6) bookworm; urgency=medium