Merge version 2.5.4-1+rpi1 and 2.5.4-1+deb12u1 to produce 2.5.4-1+rpi1+deb12u1

diff --cc debian/changelog
index a28570bbca89e6799663e34e0359ad404d99c88e,8b6cda3a8cb4c313efa0d821e10eea4f2dfd6909..acf27835edd5e8477382369f18210df81e2ff799
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- libseccomp (2.5.4-1+rpi1) bookworm-staging; urgency=medium
++libseccomp (2.5.4-1+rpi1+deb12u1) 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>  Wed, 27 Apr 2022 08:18:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 01 Jul 2024 21:16:04 +0000
++
+ libseccomp (2.5.4-1+deb12u1) bookworm; urgency=medium
+ 
+   * Add support for syscalls up to Linux 6.7. (Closes: #1071822)
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sat, 25 May 2024 20:36:52 +0200
  
  libseccomp (2.5.4-1) unstable; urgency=medium