Merge version 247.2-4+rpi1 and 247.2-5 to produce 247.2-5+rpi1

diff --cc debian/changelog
index e8ddc09685b0d89ec770d58eb88e9e38ead5fad6,15c2e826e51ff37e60e0fec02ea4959e0cf16624..d902ad0795a21e6ffeba510719ea9fd3c0b709e0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,30 +1,44 @@@
- systemd (247.2-4+rpi1) bullseye-staging; urgency=medium
++systemd (247.2-5+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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jan 2021 21:57:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 07:50:07 +0000
++
+ systemd (247.2-5) unstable; urgency=medium
+ 
+   [ Matthias Klumpp ]
+   * Configure localed to run locale-gen to generate missing locale.
+     This applies an (upstreamed) patch to permit systemd-localed to run
+     locale-gen to generate missing locale when requested to switch the
+     system locale.
+     This makes localectl usable on Debian for changing locale without
+     breaking system localization or even prevent certain applications from
+     running at all after switching to a non-generated locale.
+ 
+   [ Michael Biebl ]
+   * systemctl: do not shutdown immediately on scheduled shutdown.
+     When, for whatever reason, a scheduled shutdown fails to be set, systemd
+     will proceed with immediate shutdown without allowing the user to react.
+     This is counterintuitive because when a scheduled shutdown is issued,
+     it means the user wants to shutdown at a specified time in the future,
+     not immediately. (Closes: #931235)
+   * test: disable DnsmasqClientTest.test_resolved_etc_hosts in
+     networkd-test.py.
+     This test appears to be flaky.
+     See: #979716
+   * Bump Standards-Version to 4.5.1
+   * Set upstream metadata fields: Bug-Submit, Bug-Database, Repository,
+     Repository-Browse
+ 
+  -- Michael Biebl <biebl@debian.org>  Mon, 18 Jan 2021 13:45:15 +0100
  
  systemd (247.2-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge