Merge version 245.4-3+rpi1 and 245.5-1 to produce 245.5-1+rpi1

diff --cc debian/changelog
index 0b716adc7e771515b78f8e4b33ead920798f9b2c,b6002129b28c71fb0080c4f9ae772d1eba573295..604c3bfddd100ae14871e8a76000c3a0017683c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,34 +1,51 @@@
- systemd (245.4-3+rpi1) bullseye-staging; urgency=medium
++systemd (245.5-1+rpi1) bullseye-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 239-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 22:47:19 +0000]
 +  * Force build with gcc-7 (LP: #1793415)
 +
 +  [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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Apr 2020 12:17:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 26 Apr 2020 15:44:36 +0000
++
+ systemd (245.5-1) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * New upstream version 245.5
+   * Rebase patches
+ 
+   [ Dan Streetman ]
+   * Follow symlinks when finding link files to copy into initramfs.
+     If the /{etc,lib}/systemd/network directory itself is a symlink, the find
+     command will not actually find any of the files in the dir it links to.
+     Use the find -L param to follow symlinks.
+     (LP: #1868892)
+   * Remove Ubuntu-specific ondemand.service.
+     New processors handle scaling/throttling in internal firmware
+     (e.g. intel_pstate), and do not require OS config.
+     Additionally, nobody else does this, not even Debian.
+ 
+  -- Michael Biebl <biebl@debian.org>  Sat, 18 Apr 2020 20:41:18 +0200
+ 
+ systemd (245.4-4) unstable; urgency=medium
+ 
+   * Drop Conflicts: virtualbox-guest-utils from systemd-timesyncd.
+     Otherwise this could lead to virtualbox-guest-utils being uninstalled on
+     upgrades which is not intended. (Closes: #956436)
+   * pid1: automatically generate systemd-remount-fs.service deps, plus enable
+     systemd-pstore from sysinit.target
+   * Fix systemd-pstore.service enablement symlink on upgrades.
+     It is now started via sysinit.target. Also clean up the symlink on
+     purge.
+ 
+  -- Michael Biebl <biebl@debian.org>  Mon, 13 Apr 2020 11:34:31 +0200
  
  systemd (245.4-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge