Manual merge of version 251.6-1+rpi1 and 252.2-1 to produce 252.2-1+rpi1

diff --cc debian/changelog
index a9e8086d0a3ae1f859fbe685d131d05477151dff,9aaf5bd4edc4114e07a1fd7cd646d6112ba46df3..63f2acbf58312cd0e798947cb9dd6e87cd96cd7f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,107 +1,121 @@@
- systemd (251.6-1+rpi1) bookworm-staging; urgency=medium
++systemd (252.2-1+rpi1) bookworm-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>  Wed, 19 Oct 2022 02:22:36 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 13 Dec 2022 11:44:53 +0000
++
+ systemd (252.2-1) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Explicitly B-D on libcrypt-dev (Closes: #1024646)
+ 
+   [ Nick Rosbrook ]
+   * Add handling for /etc/default/locale to firstboot. The TEST-74-AUX-
+     UTILS upstream test revealed that firstboot does not currently handle
+     Debian's /etc/default/locale.
+ 
+   [ Luca Boccassi ]
+   * Build depend on dh-package-notes, sequence was removed. Only the
+     makefile is in use now, no files are generated at build time as
+     --package-metadata from the linkers is used now
+   * New upstream version 252.2
+   * Refresh patches
+ 
+  -- Luca Boccassi <bluca@debian.org>  Mon, 28 Nov 2022 22:35:56 +0000
+ 
+ systemd (252.1-1) unstable; urgency=medium
+ 
+   * d/watch: switch back to stable repository
+   * New upstream version 252.1 (Closes: #1023607 #1023515)
+   * Drop patches merged upstream
+   * Refresh patches
+   * Suggest polkitd instead of policykit-1 (deprecated)
+ 
+  -- Luca Boccassi <bluca@debian.org>  Tue, 08 Nov 2022 14:23:22 +0000
+ 
+ systemd (252-3) unstable; urgency=medium
+ 
+   * Backport patches to fix tmpfiles error and missing /dev/serial/by-
+     id/usb-* (Closes: #1023311)
+   * Drop :native suffix from python3-pyparsing build dependency (Closes:
+     #1023442)
+   * Enable support for libqrencode. dlopen() feature so no additional cost.
+     Allows printing out recovery keys in QR format.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sun, 06 Nov 2022 14:16:52 +0000
+ 
+ systemd (252-2) unstable; urgency=medium
+ 
+   [ Jochen Sprickerhof ]
+   * Let dh_installsysusers fix the /var/log/journal permissions.
+     dh_installsysusers adds a systemd-sysusers in #DEBHELPER#. Otherwise
+     it fails with: /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve
+     group 'systemd-journal'. Regression of fa0aade329. (Closes: #1023248)
+   * Move restarting units after #DEBHELPER#. This makes sure that systemd-
+     sysusers was executed as well as systemd-tmpfiles to setup proper
+     permissions for /var/log/journal before systemd-journald is being
+     restarted.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Tue, 01 Nov 2022 12:06:18 +0000
+ 
+ systemd (252-1) unstable; urgency=medium
+ 
+   * Use systemd-sysusers to setup systemd users and groups
+   * New upstream version 252
+   * Drop patches merged upstream
+   * libsystemd0: set symbols version to 252
+   * Drop unused lintian override
+ 
+  -- Luca Boccassi <bluca@debian.org>  Mon, 31 Oct 2022 22:02:43 +0000
+ 
+ systemd (252~rc3-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Thu, 27 Oct 2022 15:24:32 +0100
+ 
+ systemd (252~rc3-1) experimental; urgency=medium
+ 
+   * New upstream version 252~rc3
+   * Refresh patches
+   * Backport patches to fix tests without machine-id. Drop out-of-tree
+     patch and backport upstream fixes.
+ 
+  -- Luca Boccassi <bluca@debian.org>  Tue, 25 Oct 2022 01:30:02 +0100
+ 
+ systemd (252~rc2-1) experimental; urgency=medium
+ 
+   [ Jan Kiszka ]
+   * Enable systemd-boot for riscv64. Tested against U-Boot 2022.10 as UEFI
+     provider on the RZ/Five. Signed-off-by: Jan Kiszka
+     <jan.kiszka@siemens.com>
+ 
+   [ Helmut Grohne ]
+   * Conditionalize installation of cryptsetup plugins in stage1 using dh-
+     exec (Closes: #1021821)
+ 
+   [ Michael Biebl ]
+   * Install sysusers.d and tmpfiles.d man pages in standalone packages
+     (Closes: #1021933)
+ 
+   [ Luca Boccassi ]
+   * d/watch: switch to non-stable repo
+   * New upstream version 252~rc2
+   * Drop patches merged upstream
+   * Refresh patches
+   * Update symbols file
+   * Update Lintian overrides
+   * autopkgtest: update expected output of localectl
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sat, 22 Oct 2022 01:10:00 +0100
  
  systemd (251.6-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 69539523a106f7a10b8e2bc86977cd9406dc35d8,66fb7abb7f2bdb8641270937d4e882414c1cfc2a..798cdd086498e5100c599ef8cfa3b8c5c4a1dcfa
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -290,10 -291,9 +291,9 @@@ override_dh_makeshlibs
        dh_makeshlibs --remaining-packages -- -c$(GENSYMBOLS_LEVEL)
  
  override_dh_auto_test:
 -ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
-       echo "01234567890123456789012345678901" > obj-$(DEB_HOST_GNU_TYPE)/machine-id
        # some tests hang under fakeroot, so disable fakeroot
-       env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/machine-id meson test -C obj-$(DEB_HOST_GNU_TYPE) --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)
+       env -u LD_PRELOAD meson test -C obj-$(DEB_HOST_GNU_TYPE) --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)
  endif
  
  %: