Merge version 5.4.1-1+rpi1 and 5.4.2-1 to produce 5.4.2-1+rpi1

diff --cc debian/changelog
index bf0f521e22823eb1cb5230dabaf023f71c8b3839,0c45d79581506663e78490c539969a94e47e47e6..a3efccaf621b595ac9a5f2f1eb13eb3d7689916c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- fplll (5.4.1-1+rpi1) bookworm-staging; urgency=medium
++fplll (5.4.2-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>  Thu, 02 Sep 2021 20:25:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Jun 2022 21:00:22 +0000
++
+ fplll (5.4.2-1) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * debian/copyright: use spaces rather than tabs to start continuation lines.
+   * Set upstream metadata fields: Repository.
+ 
+   [ Julien Puydt ]
+   * Move to the math team.
+   * Bump standards-version to 4.6.1.
+   * New upstream release.
+   * Refresh patches.
+ 
+  -- Julien Puydt <jpuydt@debian.org>  Mon, 30 May 2022 15:51:40 +0200
  
  fplll (5.4.1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge