Merge version 2.2-1+rpi1 and 2.4-1 to produce 2.4-1+rpi1

diff --cc avcall/avcall-armhf-macro.S
Simple merge

diff --cc debian/changelog
index beeb88ccd108680e2dbe6a96192a7aff206c392c,a57776c453e4d712410ccb15992693eaea157cb0..d3c45631010f6ab8900d5cda1919e3cea23bf317
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,27 @@@
- ffcall (2.2-1+rpi1) bullseye-staging; urgency=medium
++ffcall (2.4-1+rpi1) bookworm-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
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 16:56:37 +0000
++
+ ffcall (2.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Drop transitional package libffcall1-dev
+   * Fix d/upstream/signing-key.asc
+   * d/copyright: reflect upstream changes
+   * cross.patch: drop patch, applied upstream
+   * mips-r6.patch: drop patch, no longer applies. This patch should rather
+     be upstreamed, it’s not maintainable at the Debian level.
+   * lib{avcall1,ffcall1b}.symbols: add new symbols
+   * Bump to debhelper 13
+   * Bump S-V to 4.6.0
+   * Add d/upstream/metadata
+   * Move Homepage and Upstream-Contact fields to gnu.org
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Thu, 26 Aug 2021 19:05:36 +0200
  
  ffcall (2.2-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8e3180f3ee79f3f49f6f97df081125a5e242e9e2,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c54595a1b5d79cbe470b72764b5dcbc40d2f68a8
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- mips-r6.patch
- cross.patch
 +raspbian.patch