Merge version 246.6-2+rpi1 and 246.6-4 to produce 246.6-4+rpi1

diff --cc debian/changelog
index 527769145367c2178d5b7ccd88001154093eeddf,c8c99ede658435ed5a9aebba0cb60115cc8bf611..c532a39290ad46aff6f5acb043f5092f831a8a6e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,33 +1,47 @@@
- systemd (246.6-2+rpi1) bullseye-staging; urgency=medium
++systemd (246.6-4+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, 22 Oct 2020 19:16:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Nov 2020 17:39:44 +0000
++
+ systemd (246.6-4) unstable; urgency=medium
+ 
+   * Revert "Trigger a systemctl daemon-reload when init scripts are installed
+     or removed"
+     Remove the dpkg file trigger which called systemctl daemon-reload whenever
+     a SysV init script was installed. We have proper support in debhelper
+     nowadays which makes this superfluous and we want to avoid unnecessary
+     systemctl daemon-reload calls.
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 19 Nov 2020 22:35:48 +0100
+ 
+ systemd (246.6-3) unstable; urgency=medium
+ 
+   * pam: include pam_keyinit session module in systemd-user.
+     We want that systemd --user gets its own keyring, not the basic keyring
+     set up by systemd --system.
+   * pam: move systemd-user PAM config from /etc/pam.d to /usr/lib/pam.d.
+     This is supported since PAM 1.2 and we want as little files in /etc as
+     possible.
+   * init-functions: update LSB hook to not use ignore-dependencies
+     job-mode=ignore-dependencies, as currently used in the LSB hook during
+     bootup and shutdown, can have undesired side-effects, like changing the
+     ordering of services and ultimately causing them to fail, due to unmet
+     dependencies.
+     So simplify that, and only apply --no-block on reload requests during
+     bootup and shutdown. (Closes: #960594)
+   * d/t/timedated: use /bin/bash to work around job handling issue in dash.
+     See: #975010
+ 
+  -- Michael Biebl <biebl@debian.org>  Tue, 17 Nov 2020 23:34:07 +0100
  
  systemd (246.6-2) unstable; urgency=medium