Merge version 246-2+rpi1 and 246.1-1 to produce 246.1-1+rpi1

diff --cc debian/changelog
index c9034d38927bfb30c92708a5bfa410b380989e57,4172dc1d735feb1f4bc14b38df51d6cab44fc13a..ac50f84311436afd125554b231a850e37815ee1c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,23 @@@
- systemd (246-2+rpi1) bullseye-staging; urgency=medium
++systemd (246.1-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 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)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 14 Aug 2020 00:03:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Aug 2020 15:51:32 +0000
++
+ systemd (246.1-1) unstable; urgency=medium
+ 
+   * New upstream version 246.1
+   * Rebase patches
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 16 Aug 2020 13:14:46 +0200
  
  systemd (246-2) unstable; urgency=medium