Merge version 1.2.2-2+rpi1 and 1.2.4-1 to produce 1.2.4-1+rpi1

diff --cc debian/changelog
index 93ee31781f3264c0a66d4222fc7366f3a917500e,d15f6279d35cee5d8b8d6a87bd245e8b89287ba8..f26ff0a01f2d9ef938b44d481aa4ab1f436e5288
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- nbdkit (1.2.2-2+rpi1) buster-staging; urgency=medium
++nbdkit (1.2.4-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.1.16-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 12:09:47 +0000]
 +  * Change kernel build-dep for Raspbian.
 +  * Disable testsuite.
 +  * Add build-conflicts on ocaml-base-nox
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 15 May 2018 07:21:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jun 2018 04:07:21 +0000
++
+ nbdkit (1.2.4-1) unstable; urgency=medium
+ 
+   * New upstream version 1.2.4
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 16 Jun 2018 13:24:18 +0200
  
  nbdkit (1.2.2-2) unstable; urgency=medium