Merge version 12.4+rpi1 and 12.4+deb12u1 to produce 12.4+rpi1+deb12u1

diff --cc debian/changelog
index b67a8c69b7c7156bbe49277e7e09a131f015cb3c,f631183eb4c5d7cd90469c79b8e89ff21ef279d6..5f1c11e0f02dedc15334efa10aa76829e99a4fe3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,8 +1,26 @@@
- base-files (12.4+rpi1) bookworm-staging; urgency=medium
++base-files (12.4+rpi1+deb12u1) 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>  Thu, 01 Jun 2023 21:09:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2023 06:05:24 +0000
++
+ base-files (12.4+deb12u1) bookworm; urgency=medium
+ 
+   * Change /etc/debian_version to 12.1, for Debian 12.1 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 14 Jul 2023 18:00:00 +0200
  
  base-files (12.4) unstable; urgency=medium