Manual merge of version 5.3.2-1+rpi1 and 5.3.3-1 to produce 5.3.3-1+rpi1

diff --cc debian/changelog
index f6858d81d1e1005e646f4858d7f8215ac41dcaa2,24aaa5cd49f5024a7ef4df1dc8540acfc30ebb28..a6db9d1115df93ac6935fc5cc50c189e44bb7ff1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- fplll (5.3.2-1+rpi1) bullseye-staging; urgency=medium
++fplll (5.3.3-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.3.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 11 Jan 2020 01:35:53 +0000]
 +  * Use -latomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 20 Jan 2020 00:06:14 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 11 Jul 2020 12:00:58 +0000
++
+ fplll (5.3.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update the team mail address.
+   * Bump std-ver to 4.5.0.
+   * Drop -Wl,--as-needed from d/rules (it's now the default).
+   * Ship the static library (Closes: #964062).
+   * Refresh patches and drop upstreamed ones.
+   * Add b-dep on pkg-config.
+ 
+  -- Julien Puydt <jpuydt@debian.org>  Sun, 05 Jul 2020 09:51:48 +0200
  
  fplll (5.3.2-1) unstable; urgency=medium
  

diff --cc debian/rules
index 077449d0c65f3ca99ecf81a8f28f64e5ebe4e6c8,2daa0d6b729b6bfbc15e4b5525016228b9cff6a7..cca5d9ddd766baeb0c34176063658041819bfdf8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -5,10 -5,8 +5,8 @@@
  # for which I thank:
  # - ARM Ltd for hosting
  # - Marvell Technology Group Ltd for the hardware
 -ifneq (,$(findstring $(DEB_HOST_ARCH),armel mipsel m68k powerpc sh4))
 +ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf mipsel m68k powerpc sh4))
- export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -latomic
- else
- export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+ export DEB_LDFLAGS_MAINT_APPEND=-latomic
  endif
  
  export DEB_CPPFLAGS_MAINT_APPEND= -D_LARGEFILE_SOURCE