diff -Nru cmake-3.18.4/debian/changelog cmake-3.18.4/debian/changelog
--- cmake-3.18.4/debian/changelog	2021-02-07 09:23:34.000000000 +0000
+++ cmake-3.18.4/debian/changelog	2021-02-10 12:52:09.000000000 +0000
@@ -1,3 +1,11 @@
+cmake (3.18.4-2+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 3.16.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 11 May 2020 11:15:49 +0000]
+  * Disable testsuite.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Feb 2021 12:52:09 +0000
+
 cmake (3.18.4-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
diff -Nru cmake-3.18.4/debian/rules cmake-3.18.4/debian/rules
--- cmake-3.18.4/debian/rules	2020-10-15 18:02:00.000000000 +0000
+++ cmake-3.18.4/debian/rules	2021-02-10 12:52:09.000000000 +0000
@@ -52,11 +52,12 @@
 override_dh_auto_test:
 	# Pass -j1 to "make test" as a workaround, see https://gitlab.kitware.com/cmake/cmake/issues/17165
 	# The tests are still run in parallel as debhelper pass -jX as ARGS to ctest.
-	dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E CTestTestUpload --timeout 5000"
+	#dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E CTestTestUpload --timeout 5000"
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f $(BUILD_FLAGS_FILE)
+	rm -rf Utilities/Sphinx/__pycache__
 
 override_dh_missing:
 	dh_missing --fail-missing