diff -Nru systemd-249.5/debian/changelog systemd-249.5/debian/changelog
--- systemd-249.5/debian/changelog	2021-10-12 20:39:59.000000000 +0000
+++ systemd-249.5/debian/changelog	2021-10-15 10:50:57.000000000 +0000
@@ -1,3 +1,17 @@
+systemd (249.5-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>  Fri, 15 Oct 2021 10:50:57 +0000
+
 systemd (249.5-1) unstable; urgency=medium
 
   * New upstream version 249.5
diff -Nru systemd-249.5/debian/control systemd-249.5/debian/control
--- systemd-249.5/debian/control	2021-10-12 20:39:59.000000000 +0000
+++ systemd-249.5/debian/control	2021-10-15 10:50:57.000000000 +0000
@@ -83,6 +83,7 @@
            systemd-shim,
 Breaks: resolvconf (<< 1.83~),
         udev (<< 247~),
+        raspi-copies-and-fills (<< 0.7)
 Provides: systemd-sysusers (= ${binary:Version}),
           systemd-tmpfiles (= ${binary:Version}),
 Description: system and service manager
diff -Nru systemd-249.5/debian/rules systemd-249.5/debian/rules
--- systemd-249.5/debian/rules	2021-10-12 20:39:59.000000000 +0000
+++ systemd-249.5/debian/rules	2021-10-15 10:50:57.000000000 +0000
@@ -322,7 +322,7 @@
 	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" > build-deb/machine-id
 	# some tests hang under fakeroot, so disable fakeroot
 	env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id meson test -C build-deb --print-errorlogs $(TEST_TIMEOUT_MULTIPLIER)