From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 18 Apr 2018 20:44:52 +0000 (+0100)
Subject: Merge version 2.1-1+rpi1 and 2.1-2 to produce 2.1-2+rpi1
X-Git-Tag: archive/raspbian/2.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fda294007da1a44205da90980d31b0bea0fdfa44;p=ffcall.git

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

fda294007da1a44205da90980d31b0bea0fdfa44
diff --cc debian/changelog
index bbdfdad,1f19d2e..35d7669
--- a/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 ad6cb95,8f83849..d2c7d80
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
+ mips-r6.patch
  mips-fpxx.patch
 +raspbian.patch