diff -Nru meson-0.54.2/debian/changelog meson-0.54.2/debian/changelog
--- meson-0.54.2/debian/changelog	2020-05-15 07:26:05.000000000 +0000
+++ meson-0.54.2/debian/changelog	2020-06-07 23:51:08.000000000 +0000
@@ -1,3 +1,12 @@
+meson (0.54.2-1+rpi1) bullseye-staging; urgency=medium
+
+  * Apply upstream patch to prefer shared boost over static boost.
+    ( Closes: 960877 )
+  * Fix clean target.
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 07 Jun 2020 23:51:08 +0000
+
 meson (0.54.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru meson-0.54.2/debian/patches/prefer-shared-boost.patch meson-0.54.2/debian/patches/prefer-shared-boost.patch
--- meson-0.54.2/debian/patches/prefer-shared-boost.patch	1970-01-01 00:00:00.000000000 +0000
+++ meson-0.54.2/debian/patches/prefer-shared-boost.patch	2020-06-07 23:51:08.000000000 +0000
@@ -0,0 +1,26 @@
+commit 5862ad6965c60caa861dfdcd29e499c34c4d00da
+Author: Daniel Mensinger <daniel@mensinger-ka.de>
+Date:   Thu May 21 13:35:27 2020 +0200
+
+    boost: Always sort shared before static (fixes #7171)
+
+diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
+index 6e85c534..38497041 100644
+--- a/mesonbuild/dependencies/boost.py
++++ b/mesonbuild/dependencies/boost.py
+@@ -189,13 +189,13 @@ class BoostLibraryFile():
+     def __lt__(self, other: T.Any) -> bool:
+         if isinstance(other, BoostLibraryFile):
+             return (
+-                self.mod_name, self.version_lib, self.arch, self.static,
++                self.mod_name, self.static, self.version_lib, self.arch,
+                 not self.mt, not self.runtime_static,
+                 not self.debug, self.runtime_debug, self.python_debug,
+                 self.stlport, self.deprecated_iostreams,
+                 self.name,
+             ) < (
+-                other.mod_name, other.version_lib, other.arch, other.static,
++                other.mod_name, other.static, other.version_lib, other.arch,
+                 not other.mt, not other.runtime_static,
+                 not other.debug, other.runtime_debug, other.python_debug,
+                 other.stlport, other.deprecated_iostreams,
diff -Nru meson-0.54.2/debian/patches/series meson-0.54.2/debian/patches/series
--- meson-0.54.2/debian/patches/series	2020-05-15 07:26:05.000000000 +0000
+++ meson-0.54.2/debian/patches/series	2020-06-07 23:51:08.000000000 +0000
@@ -1,2 +1,3 @@
 1-disable-openmpi.patch
 2-disable-rootdir-test.patch
+prefer-shared-boost.patch
diff -Nru meson-0.54.2/debian/rules meson-0.54.2/debian/rules
--- meson-0.54.2/debian/rules	2019-11-23 20:11:19.000000000 +0000
+++ meson-0.54.2/debian/rules	2020-06-07 23:51:08.000000000 +0000
@@ -16,5 +16,11 @@
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.py
+	#./run_tests.py
 endif
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f dist/meson-0.54.2-py3.8.egg
+	rm -rf .pytest_cache
+	rm -f dub_platform_probe_* meson-test-run.txt meson-test-run.xml