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

diff --cc debian/changelog
index a28570bbca89e6799663e34e0359ad404d99c88e,8451fc0287a985280c7ec91443b1d03562b6b2d4..e78e121ef6c8a8dd0f1cb71466ff4ea5c9eb0f5e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- libseccomp (2.5.4-1+rpi1) bookworm-staging; urgency=medium
++libseccomp (2.5.4-2+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>  Wed, 27 Apr 2022 08:18:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Nov 2023 02:19:23 +0000
++
+ libseccomp (2.5.4-2) unstable; urgency=medium
+ 
+   * Fix watch file. (Closes: #1050659)
+   * Dynamically skip autopkgtests when the test runner already applies seccomp
+     restrictions.
+     - Drop isolation-machine restriction.
+   * Fix FTBFS with setuptools. (Closes: #1054788, #1033641)
+     - Add python_Fix_distutils_DeprecationWarning.patch
+     - Add python_single_version_externally_managed.patch
+     - Explicitly build-depend on python3-setuptools
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 29 Oct 2023 15:13:08 +0100
  
  libseccomp (2.5.4-1) unstable; urgency=medium
  

diff --cc debian/control
index 969eacc10f63e7aefb74b25b28dac5f1f7dbaa9f,592487b06932fa03f59cd8d266ce66b671425451..d57912c59273429093a3fc5cac0f5bf2d046284a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,10 @@@ Build-Depends: debhelper-compat (= 12)
                 python3-all-dev:any <!nopython>,
                 libpython3-all-dev <!nopython>,
                 cython3:native <!nopython>,
 -               valgrind [amd64 arm64 armhf i386 mips mips64 powerpc ppc64 ppc64el s390x] <!nocheck>,
+                python3-setuptools <!nopython>,
                 gperf
 +Build-Conflicts:
 +               valgrind
  Rules-Requires-Root: no
  Standards-Version: 3.9.7
  Homepage: https://github.com/seccomp/libseccomp