diff -Nru ffcall-2.2/debian/changelog ffcall-2.2/debian/changelog
--- ffcall-2.2/debian/changelog	2019-08-28 19:39:51.000000000 +0000
+++ ffcall-2.2/debian/changelog	2019-09-03 18:09:25.000000000 +0000
@@ -1,3 +1,11 @@
+ffcall (2.2-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Dec 2017 01:23:49 +0000]
+  * Mark binaries as vpfv2 not vfpv3_d16
+  * Disable testsuite, it fails on some of our buildboxes.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Sep 2019 18:09:25 +0000
+
 ffcall (2.2-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ffcall-2.2/debian/patches/raspbian.patch ffcall-2.2/debian/patches/raspbian.patch
--- ffcall-2.2/debian/patches/raspbian.patch	1970-01-01 00:00:00.000000000 +0000
+++ ffcall-2.2/debian/patches/raspbian.patch	2019-09-03 18:09:25.000000000 +0000
@@ -0,0 +1,38 @@
+Description: ffcall changes for raspbian.
+   * Replace movw/movt with ldr psuedo instruction.
+   * Mark binaries as armv6 not armv7
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ffcall-2.2.orig/avcall/avcall-armhf-macro.S
++++ ffcall-2.2/avcall/avcall-armhf-macro.S
+@@ -15,7 +15,7 @@
+ 	.global C(avcall_call)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	avcall_call, %function
+ FUNBEGIN(avcall_call)
+ 	// args = 0, pretend = 0, frame = 0
+--- ffcall-2.2.orig/callback/vacall_r/vacall-armhf-macro.S
++++ ffcall-2.2/callback/vacall_r/vacall-armhf-macro.S
+@@ -15,7 +15,7 @@
+ 	.global C(callback_receiver)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	callback_receiver, %function
+ FUNBEGIN(callback_receiver)
+ 	// args = 28, pretend = 0, frame = 176
+--- ffcall-2.2.orig/vacall/vacall-armhf-macro.S
++++ ffcall-2.2/vacall/vacall-armhf-macro.S
+@@ -169,7 +169,7 @@ L(32):
+ 	.global C(vacall_receiver)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	vacall_receiver, %function
+ FUNBEGIN(vacall_receiver)
+ 	// args = 20, pretend = 16, frame = 176
diff -Nru ffcall-2.2/debian/patches/series ffcall-2.2/debian/patches/series
--- ffcall-2.2/debian/patches/series	2019-08-28 19:29:45.000000000 +0000
+++ ffcall-2.2/debian/patches/series	2019-09-03 18:09:25.000000000 +0000
@@ -1,2 +1,3 @@
 mips-r6.patch
 cross.patch
+raspbian.patch
diff -Nru ffcall-2.2/debian/rules ffcall-2.2/debian/rules
--- ffcall-2.2/debian/rules	2019-08-28 19:38:47.000000000 +0000
+++ ffcall-2.2/debian/rules	2019-09-03 18:09:25.000000000 +0000
@@ -6,3 +6,6 @@
 
 %:
 	dh $@ --no-parallel
+
+override_dh_auto_test:
+	echo testsuite disabled.