Merge version 256.4-2+rpi1 and 256.4-3 to produce 256.4-3+rpi1

diff --cc debian/changelog
index c44e455afe21ef4703e5aba893aec4db4cc5ae33,9b8df027756ea4c9481c3d00e6be437d628c9219..eee8da61a86052bb8dd300422c5ea9eba89c7e2f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,27 +1,49 @@@
- systemd (256.4-2+rpi1) trixie-staging; urgency=medium
++systemd (256.4-3+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.
 +
 +  [changes introduced in 255.3-1+rpi1 by Peter Michael Green]
 +  * Remove armhf from architecture lists for files that appear systemd-boot
 +    related
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 02 Aug 2024 01:44:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Aug 2024 03:13:59 +0000
++
+ systemd (256.4-3) unstable; urgency=medium
+ 
+   * Drop redundant pot build. This was added many years ago, when
+     apparently the upstream pot generation wasn't run or wasn't working.
+     This is not the case anymore, pot files are regenerated upstream and
+     checked in on every release, so this manual step just updates the
+     timestamp in the existing template and nothing else. Drop it.
+   * Use debian/clean instead of override in d/rules
+   * Stop shipping empty /etc/init.d directory. We do not have any need for
+     it, and will soon stop supporting legacy init files, so stop shipping
+     it
+   * Use d/not-installed instead of manual removals. We no longer install
+     in the main package with a wildcard so we do not need to manually
+     delete files, listing them in d/not-installed is sufficient. The only
+     exceptions are files picked up by directory/wildcard entries in
+     dh_install that have to be deleted.
+   * autopkgtest: run upstream test last. It is the most complex and thus
+     the most likely to show temporary failures, so move it last so that
+     it's easier to read the logs
+   * autopkgtest: use hint-testsuite-triggers to ensure other packages
+     changes trigger our testsuite
+   * Depend on new linux-bpf-dev package where available
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sun, 11 Aug 2024 11:53:32 +0100
  
  systemd (256.4-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge

diff --cc debian/systemd.install
Simple merge