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

diff --cc debian/changelog
index d3c45631010f6ab8900d5cda1919e3cea23bf317,86f6bbfbcee6ef277fb121c1a9e88cbcadaac815..67586e914fb17f9741de59d82cf341554031379c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- ffcall (2.4-1+rpi1) bookworm-staging; urgency=medium
++ffcall (2.4-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 16:56:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jun 2022 10:15:27 +0000
++
+ ffcall (2.4-2) unstable; urgency=medium
+ 
+   * d/copyright: fix short license name (FSFULLR instead of FSFUL)
+   * m4-dirs.patch: new patch, to tell Autoconf where to look for local macros.
+     As a consequence, no longer pass these directories as arguments to aclocal
+     in debian/rules. Libtool macros are thus properly updated by dh-autoreconf.
+     (Closes: #1011808)
+   * Bump S-V to 4.6.1
+   
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 08 Jun 2022 10:34:29 +0200
  
  ffcall (2.4-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index c54595a1b5d79cbe470b72764b5dcbc40d2f68a8,384f135b6b3c7a6ca1c1badaae84030a7d3b0867..3e57fad556bb0741bf017e79cab34d4b490936fe
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,1 +1,2 @@@
+ m4-dirs.patch
 +raspbian.patch

diff --cc debian/rules
index 34077191dd825a1ec90258120834c5d8da104515,c68550672438c54cbe44d765e198d2e7870db8b0..f17ae57211a45e3b3c60b2f185b4cd0b9f86fb37
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -2,10 -2,5 +2,8 @@@
  
  include /usr/share/dpkg/default.mk
  
- export ACLOCAL = aclocal -I$(CURDIR)/m4 -I$(CURDIR)/gnulib-m4
- 
  %:
        dh $@ --no-parallel
 +
 +override_dh_auto_test:
 +      echo testsuite disabled.