diff -Nru graphicsmagick-1.4+really1.3.36+hg16442/debian/changelog graphicsmagick-1.4+really1.3.36+hg16442/debian/changelog
--- graphicsmagick-1.4+really1.3.36+hg16442/debian/changelog	2021-01-08 17:02:36.000000000 +0000
+++ graphicsmagick-1.4+really1.3.36+hg16442/debian/changelog	2021-01-22 09:40:59.000000000 +0000
@@ -1,3 +1,10 @@
+graphicsmagick (1.4+really1.3.36+hg16442-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.4+really1.3.36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Dec 2020 03:11:26 +0000]
+  * Ignore test failures, the tests fail on 64-bit kernels.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 09:40:59 +0000
+
 graphicsmagick (1.4+really1.3.36+hg16442-1) unstable; urgency=high
 
   * Mercurial snapshot, fixing the following security issues:
diff -Nru graphicsmagick-1.4+really1.3.36+hg16442/debian/rules graphicsmagick-1.4+really1.3.36+hg16442/debian/rules
--- graphicsmagick-1.4+really1.3.36+hg16442/debian/rules	2020-12-12 19:44:16.000000000 +0000
+++ graphicsmagick-1.4+really1.3.36+hg16442/debian/rules	2021-01-22 09:40:59.000000000 +0000
@@ -16,7 +16,7 @@
 	gm_confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-ARCHS_CHECK_NOFAIL:=hppa sparc
+ARCHS_CHECK_NOFAIL:=hppa sparc armhf
 ifneq (,$(findstring $(DEB_BUILD_ARCH),$(ARCHS_CHECK_NOFAIL)))
 CHECK_FAILED_ACTION:=echo "Ignoring testsuite failures on this architecture"
 else