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

diff --cc debian/changelog
index e78e121ef6c8a8dd0f1cb71466ff4ea5c9eb0f5e,a7bd0754063fc7b2543ca98c0496e0649222866e..bcc967d975c732e109d481842f1f87eb2edd2e5d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- libseccomp (2.5.4-2+rpi1) trixie-staging; urgency=medium
++libseccomp (2.5.5-1+rpi1) trixie-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>  Sat, 11 Nov 2023 02:19:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2024 23:38:25 +0000
++
+ libseccomp (2.5.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Thu, 04 Jan 2024 18:29:54 +0100
  
  libseccomp (2.5.4-2) unstable; urgency=medium