Merge version 254.1-3+rpi1 and 254.5-1 to produce 254.5-1+rpi1

diff --cc debian/changelog
index 93791b19337b69d569486183b37b881f205e466b,fe1f4bce28b1bb2c7889437d84329d8efb4ffe0b..70f2693a5a55bb903dff50d78f195d9496082c75
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,59 +1,77 @@@
- systemd (254.1-3+rpi1) trixie-staging; urgency=medium
++systemd (254.5-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 20:22:45 +0000]
 +  * Disable testsuite, it fails on some of our buildboxes (probablly because of
 +    old kernels).
 +  * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with
 +    this version of systemd/udev.
 +
 +  [changes brought forward from 241-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 02 Apr 2019 19:29:26 +0000]
 +  * Bump "breaks" on raspi-copies-and-fills to << 0.12
 +    (raspi-copies-and-fills was reverted by the raspberry pi foundation)
 +
 +  [changes introduced in 254.1-3+rpi1 by Peter Michael Green.
 +  * Disable systemd-boot, it seems to fail to build and it's not really relavent
 +    for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 21 Sep 2023 02:09:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Oct 2023 01:02:44 +0000
++
+ systemd (254.5-1) unstable; urgency=medium
+ 
+   * New upstream version 254.5
+   * Refresh patches for 254.5
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sat, 30 Sep 2023 11:34:39 +0100
+ 
+ systemd (254.4-1) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * Fix installation of tzdata-legacy. Apply a version constraint to the
+     tzdata alternative. Specifically (<< 2023c-8), which is the version
+     tzdata was split. Otherwise tzdata-legacy is not considered, as tzdata
+     is installed by default. (Closes: #1051760)
+   * Drop obsolete Breaks/Replaces and migration code for versions older
+     than oldstable
+   * Drop -f from update-rc.d udev remove
+ 
+   [ Luca Boccassi ]
+   * upstream-ci: run unit tests from installed location. (Closes: #1051756)
+   * New upstream version 254.4. Fixes minor security issue in arm64
+     and riscv64 systemd-boot (EFI) with device tree blobs loading:
+     https://github.com/systemd/systemd/security/advisories/GHSA-6m6p-rjcq-334c
+   * Refresh patches
+   * Install factory-reset related units
+ 
+   [ Gioele Barabucci ]
+   * debian/udev.debian-udev.sysusers: Add Debian-specific sysusers for
+     udev
+   * d/udev.postinst: Do not use addgroup to add udev-related groups
+   * d/control: Remove adduser, it is no longer needed now that all
+     udev-related groups are generated via `sd-sysusers`.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Thu, 21 Sep 2023 11:13:06 +0100
+ 
+ systemd (254.3-1) unstable; urgency=medium
+ 
+   [ Daniel Andersson ]
+   * Add systemd-sysupdate.
+ 
+   [ Luca Boccassi ]
+   * New upstream version 254.2
+   * Refresh patches for 254.2
+   * New upstream version 254.3
+ 
+   [ Michael Biebl ]
+   * Remove obsolete SysV init script. Keep the udev alias for one more
+     release cycle.
+   * Use dh_installsystemd to handle systemd-udevd.service. This allows us
+     to drop a lot of custom maintscript code. Fix the formatting of the
+     udev maintscript code while at it.
+   * Add Conflicts against initscripts and orphan-sysvinit-scripts. Those
+     packages have undesirable side effects if systemd is the active init
+     system so ensure they can't be installed.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Mon, 11 Sep 2023 09:11:51 +0100
  
  systemd (254.1-3) unstable; urgency=medium
  

diff --cc debian/control
index 8b03b7d68db5a0d98adcd40b047a4ac19eb56b3b,ab3a1da5f95435167383b4c6b19efa02e1aa8585..b0c331ef0030128ad53d410885a4db293c519e4b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -105,11 -105,8 +105,9 @@@ Depends: ${shlibs:Depends}
  Conflicts: consolekit,
             libpam-ck-connector,
             systemd-shim,
- Breaks: resolvconf (<< 1.83~),
-         udev (<< 247~),
-         less (<< 563),
+ Breaks: less (<< 563),
          sicherboot (<< 0.1.6),
 +        raspi-copies-and-fills (<< 0.7)
  Provides: systemd-sysusers (= ${binary:Version}),
            systemd-tmpfiles (= ${binary:Version}),
  Description: system and service manager

diff --cc debian/rules
Simple merge