Merge version 2.4.4-1+rpi1 and 2.5.0-3 to produce 2.5.0-3+rpi1

diff --cc debian/changelog
index 7e6dedb990215d911537f9d52f0ef7e9bb925655,0d20ae232e1854070616b1e761dc171b4829d1a7..deeff9e6b0ddee0db5f65f893047ab28d8c51a49
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,32 +1,40 @@@
- libseccomp (2.4.4-1+rpi1) bullseye-staging; urgency=medium
++libseccomp (2.5.0-3+rpi1) bullseye-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>  Mon, 28 Sep 2020 10:25:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Nov 2020 18:53:52 +0000
++
+ libseccomp (2.5.0-3) unstable; urgency=medium
+ 
+   * Cherry-pick patch from the 2.5 branch to fix test error on mips:
+     - arch_ensure_we_dont_munge_pseudo_syscall_numbers.patch
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 08 Nov 2020 19:59:21 +0100
+ 
+ libseccomp (2.5.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Cherry-pick patches from the 2.5 branch to fix build and test errors:
+     - build_undefine_mips_to_prevent_build_problems.patch
+     - tests_use_openat_and_fstat_instead_of_open_and_stat_syscalls.patch
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 08 Nov 2020 15:49:41 +0100
+ 
+ libseccomp (2.5.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Build-depend on gperf.
+     - Update symbols file.
+   * Remove patches that have been applied upstream:
+     - cython3.patch
+     - riscv64_support.patch
+   * Cherry-pick patches from the 2.5 branch:
+     - all_only_request_the_userspace_notification_fd_once.patch
+     - system_change_our_notification_fd_handling.patch
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sat, 24 Oct 2020 13:58:28 +0200
  
  libseccomp (2.4.4-1) unstable; urgency=medium
  

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