Merge version 2.5.3-2+rpi1 and 2.5.4-1 to produce 2.5.4-1+rpi1

diff --cc debian/changelog
index a18862b32734dad755cf865d0139c652f7631e32,6b7345ff09702b2552f153d7642d17404a36ba2f..a28570bbca89e6799663e34e0359ad404d99c88e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- libseccomp (2.5.3-2+rpi1) bookworm-staging; urgency=medium
++libseccomp (2.5.4-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.4.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 22:12:36 +0000]
 +  * Move valigrind from build-depends to build-conflicts, raspbians valgrind
 +    is somewhat broken and causes testsuite failures.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Nov 2021 00:05:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Apr 2022 08:18:08 +0000
++
+ libseccomp (2.5.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Thu, 21 Apr 2022 22:23:12 +0200
  
  libseccomp (2.5.3-2) unstable; urgency=medium