Merge version 5.4.0-2+rpi1 and 5.4.1-1 to produce 5.4.1-1+rpi1

diff --cc debian/changelog
index 9d39cc0ecbda20fb51e074ac209f72e20afdb7a5,7d2089fdf94a0c308230973be20031e79932ceea..bf0f521e22823eb1cb5230dabaf023f71c8b3839
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- fplll (5.4.0-2+rpi1) bullseye-staging; urgency=medium
++fplll (5.4.1-1+rpi1) bookworm-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>  Fri, 25 Dec 2020 02:34:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 20:25:33 +0000
++
+ fplll (5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump std-vers to 4.6.0.
+   * Drop fix for gcc 11 compilation (fixed upstream).
+ 
+  -- Julien Puydt <jpuydt@debian.org>  Sun, 22 Aug 2021 08:37:20 +0200
+ 
+ fplll (5.4.0-3) unstable; urgency=medium
+ 
+   * Team Upload.
+   [ Andreas Tille ]
+   * Fix typo
+ 
+   [ Nilesh Patra ]
+   * d/p/gcc11_fix.patch: Fix gcc11 FTBFS (Closes: #984136)
+ 
+   [ Julien Puydt ]
+   * Fix d/watch.
+ 
+  -- Nilesh Patra <nilesh@debian.org>  Sun, 15 Aug 2021 16:26:15 +0530
  
  fplll (5.4.0-2) unstable; urgency=medium