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

diff --cc debian/changelog
index bbdfdadbd28311438e0c75b36f855507ea5cadc2,1f19d2ebaf208f77988fa17d914b026013595276..35d76694b2a5bce898b798749d85afedc6c5ec0a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- ffcall (2.1-1+rpi1) buster-staging; urgency=medium
++ffcall (2.1-2+rpi1) buster-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]
 +  * Replace movw/movt with ldr psuedo instruction.
 +  * Mark binaries as armv6 not armv7
 +  * Disable testsuite, it fails on some of our buildboxes.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Mar 2018 16:23:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Apr 2018 20:44:51 +0000
++
+ ffcall (2.1-2) unstable; urgency=medium
+ 
+   * mips-r6.patch: new patch by YunQiang Su, fixes build on MIPS r6.
+     (Closes: #893851)
+   * Set Maintainer to debian-common-lisp@l.d.o.
+ 
+  -- Sébastien Villemot <sebastien@debian.org>  Wed, 11 Apr 2018 19:47:18 +0200
  
  ffcall (2.1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index ad6cb95e392a6e689bd5a93531edbadf9f83c593,8f838499e15d88845635df94b28b87a3acecae36..d2c7d804edce7091c55ca18bd58f149546208ce0
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
+ mips-r6.patch
  mips-fpxx.patch
 +raspbian.patch