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

diff --cc debian/changelog
index b6780a585f61767365dcfc2f643c411fb00e40ec,c9b9f123df67e32711e570434414a0367c45a315..b67a8c69b7c7156bbe49277e7e09a131f015cb3c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,28 +1,46 @@@
- base-files (12.3+rpi1) bookworm-staging; urgency=medium
++base-files (12.4+rpi1) 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, 10 Oct 2022 02:09:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Jun 2023 21:09:32 +0000
++
+ base-files (12.4) unstable; urgency=medium
+ 
+   * Release candidate for bookworm as stable:
+   - Use "12" as version in /etc/issue and /etc/issue.net.
+     (never expected to change after release)
+   - Use 12.0 as version in /etc/debian_version.
+     (expected to change at every point release)
+   - Change PRETTY_NAME in /usr/lib/os-release, adding 12 as version number
+     and "(bookworm)" as codename. Add also VERSION_ID and VERSION.
+     (never expected to change)
+   - Variable VERSION_CODENAME was already defined as "bookworm".
+   - Update README (bookworm -> trixie).
+   * Refresh GFDL-1.2, GFDL-1.3, GPL-3, LGPL-2 and LGPL-3 from their
+     canonical place at https://ftp.gnu.org/gnu/Licenses/ as they have
+     minor editorial changes like trimming spaces, https, etc.
+   * Drop debian/current-md5sums-obsolete. Closes: #1009358.
+   * Ship a real debian/copyright file in source package instead of
+     generating it at build time.
+   * Call dh_installchangelogs using --no-trim option.
+     Add versioned build-dependency on debhelper for the above.
+   * Update lintian-overrides to new format.
+   * Rules-Requires-Root: binary-targets.
+   * Update standards version to 4.6.2.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Thu, 02 Mar 2023 14:55:00 +0100
  
  base-files (12.3) unstable; urgency=high
  

diff --cc debian/control
index d976e478190eb5de210de239cef84782aaa52d15,d4bad8a0baf843b79a340136bcd2681238c44b69..c6c4cc83047f0f34a8d99f38eb5042172b855321
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,8 -2,9 +2,9 @@@ Source: base-file
  Section: admin
  Priority: required
  Maintainer: Santiago Vila <sanvila@debian.org>
- Standards-Version: 4.1.3
- Build-Depends: debhelper-compat (= 13), moreutils
+ Standards-Version: 4.6.2
 -Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~)
++Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~), moreutils
+ Rules-Requires-Root: binary-targets
  
  Package: base-files
  Provides: base

diff --cc debian/rules
Simple merge