Merge version 5.3.3-2+rpi1 and 5.4.0-2 to produce 5.4.0-2+rpi1

diff --cc debian/changelog
index 5ccc63dff8b7abd763bb23d114845a6d04b09e8e,b251e706f1c8dfde2747dcd126f27c29de35262f..9d39cc0ecbda20fb51e074ac209f72e20afdb7a5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- fplll (5.3.3-2+rpi1) bullseye-staging; urgency=medium
++fplll (5.4.0-2+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>  Wed, 09 Sep 2020 09:24:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Dec 2020 02:34:07 +0000
++
+ fplll (5.4.0-2) unstable; urgency=medium
+ 
+   * Source-only upload to allow testing migration.
+ 
+  -- Julien Puydt <jpuydt@debian.org>  Sat, 19 Dec 2020 12:20:06 +0100
+ 
+ fplll (5.4.0-1) unstable; urgency=medium
+ 
+   * New upstream release (refreshed patches).
+   * Drop now-useless lintian overrides.
+   * Bump std-vers to 4.5.1.
+   * Add a d/upstream/metadata file.
+   * Follow upstream soname bump.
+   * Drop manpage for latsieve, which isn't there anymore.
+   * Ship the binary-independent strategies file in a
+     binary-independent packet.
+ 
+  -- Julien Puydt <jpuydt@debian.org>  Sun, 06 Dec 2020 16:11:57 +0100
  
  fplll (5.3.3-2) unstable; urgency=medium