diff -Nru dolfin-2019.2.0~git20200629.946dbd3/debian/changelog dolfin-2019.2.0~git20200629.946dbd3/debian/changelog
--- dolfin-2019.2.0~git20200629.946dbd3/debian/changelog	2020-11-18 16:09:19.000000000 +0000
+++ dolfin-2019.2.0~git20200629.946dbd3/debian/changelog	2020-11-23 14:49:44.000000000 +0000
@@ -1,3 +1,14 @@
+dolfin (2019.2.0~git20200629.946dbd3-8+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2019.2.0~git20200629.946dbd3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 04 Nov 2020 23:05:55 +0000]
+  * Build with gcc/g++ 9 to avoid ICE.
+  * partially fix clean target.
+    + Clean up debian/tmp64
+    + Clean up python/build*
+    + Clean up obj-*
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 23 Nov 2020 14:49:44 +0000
+
 dolfin (2019.2.0~git20200629.946dbd3-8) unstable; urgency=medium
 
   * [9f0767f] Fix compilation against Boost_1.74. (Closes: #974947)
diff -Nru dolfin-2019.2.0~git20200629.946dbd3/debian/control dolfin-2019.2.0~git20200629.946dbd3/debian/control
--- dolfin-2019.2.0~git20200629.946dbd3/debian/control	2020-11-17 16:56:04.000000000 +0000
+++ dolfin-2019.2.0~git20200629.946dbd3/debian/control	2020-11-23 14:49:44.000000000 +0000
@@ -51,7 +51,9 @@
  doxygen,
  graphviz,
  libjs-mathjax,
- libjs-modernizr
+ libjs-modernizr,
+ gcc-9,
+ g++-9
 Standards-Version: 4.5.0
 Homepage: http://fenicsproject.org
 Vcs-Git: https://salsa.debian.org/science-team/fenics/dolfin.git
diff -Nru dolfin-2019.2.0~git20200629.946dbd3/debian/rules dolfin-2019.2.0~git20200629.946dbd3/debian/rules
--- dolfin-2019.2.0~git20200629.946dbd3/debian/rules	2020-11-17 16:56:04.000000000 +0000
+++ dolfin-2019.2.0~git20200629.946dbd3/debian/rules	2020-11-23 14:49:44.000000000 +0000
@@ -2,6 +2,9 @@
 
 include /usr/share/dpkg/architecture.mk
 
+export CC=gcc-9
+export CXX=g++-9
+
 DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
@@ -204,6 +207,9 @@
 	rm -rf $(INSTALLATION_BUILDDIR) $(TESTDIR)
 	rm -rf $(INSTALLATION_BUILDDIR_64) $(TESTDIR_64)
 	dh_auto_clean
+	rm -rf debian/tmp64
+	rm -rf python/build*
+	rm -rf obj-*
 
 override_dh_auto_configure:
 	PETSC_DIR=$(PETSC_DIR) SLEPC_DIR=$(SLEPC_DIR) dh_auto_configure --builddir=$(BUILDDIR) -- $(CMAKE_OPTS)