Merge version 2.4.1-2+rpi1 and 2.4.2-2 to produce 2.4.2-2+rpi1

diff --cc debian/changelog
index 0800461e95271385bbeff3d04dfa0810d499e3da,dc5e258cfe11f690129f256e5bb2c2710bb72376..cd8ca060a309ec8510198de8f0d568bc27fca1ec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,41 @@@
- libseccomp (2.4.1-2+rpi1) bullseye-staging; urgency=medium
++libseccomp (2.4.2-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jul 2019 22:12:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Dec 2019 18:50:36 +0000
++
+ libseccomp (2.4.2-2) unstable; urgency=medium
+ 
+   [ Christian Ehrhardt ]
+   * d/rules: fix potential FTFBS after full python3 switch
+   * d/t/control: drop python2 test following the removal of the package
+ 
+   [ Felix Geyer ]
+   * Remove build-dependency on valgrind for mips64el as it's broken there.
+   * Backport patch to define __SNR_ppoll again.
+     - Add api_define__SNR_ppoll_again.patch
+   * Replace custom patch for cython3 with the upstream fix.
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Fri, 15 Nov 2019 18:12:53 +0100
+ 
+ libseccomp (2.4.2-1) unstable; urgency=medium
+ 
+   [ Christian Ehrhardt ]
+   * New upstream release 2.4.2 for compatibility with newer kernels and
+     fixing FTBFS (LP: #1849785).
+     - drop d/p/python_install_dir.patch (now upstream)
+     - d/rules: adapt to python 3.8 lacking the m modifier on includes
+       see https://wiki.debian.org/Python/Python3.8
+     - d/p/tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch: fix
+       build time test on arm64
+ 
+   [ Felix Geyer ]
+   * Drop Python 2 bindings. (Closes: #936917)
+     - Add cython3.patch to use the Python 3 cython variant.
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Wed, 13 Nov 2019 00:00:49 +0100
  
  libseccomp (2.4.1-2) unstable; urgency=medium
  

diff --cc debian/control
index 894e21a3bd4eeb20abaedc8126e3294e6d9eedf5,6d2dcaecd037a19f47753c8b1e3de09638087de3..87f4e5246c0a6925d265db95bf94afeb192f4643
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,14 -6,10 +6,11 @@@ Uploaders: Luca Bruno <lucab@debian.org
  Build-Depends: debhelper-compat (= 12),
                 linux-libc-dev,
                 dh-python <!nopython>,
-                python-all-dev:any <!nopython>,
-                libpython-all-dev <!nopython>,
                 python3-all-dev:any <!nopython>,
                 libpython3-all-dev <!nopython>,
-                cython:native <!nopython>,
 -               cython3:native <!nopython>,
 -               valgrind [amd64 arm64 armhf i386 mips mips64 powerpc ppc64 ppc64el s390x] <!nocheck>
 +               cython3:native <!nopython>
 +Build-Conflicts:
 +               valgrind
  Rules-Requires-Root: no
  Standards-Version: 3.9.7
  Homepage: https://github.com/seccomp/libseccomp