Merge version 1.12.2-1+rpi1 and 1.12.4-1 to produce 1.12.4-1+rpi1

diff --cc debian/changelog
index b10f251106d5fae768c3e450519e30466cfc30f6,ffad9415df76dbc530ffcb32cf52f45fe1a77f76..257a11bad89472b2e46ab94dd12ac67b14fede4d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- nbdkit (1.12.2-1+rpi1) bullseye-staging; urgency=medium
++nbdkit (1.12.4-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Mar 2019 02:09:38 +0000]
 +  * Add build-depends on genisoimage, apparently it's pulled in indirectly in
 +    Debian but not Raspbian.
 +  * Add build-conflicts on ocaml-base-nox, the upstream build auto-detects ocaml
 +    resulting in extra files and a FTBFS
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jul 2019 02:51:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Aug 2019 20:03:28 +0000
++
+ nbdkit (1.12.4-1) unstable; urgency=medium
+ 
+   * New upstream version 1.12.4
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 27 Jul 2019 11:45:20 +0200
  
  nbdkit (1.12.2-1) unstable; urgency=medium
  

diff --cc debian/control
index b6eac40e61bce2c7db3f74c9b6b029128b2e3305,21688c99567b79fec1f6ed5282a5173b4eac0395..c5af73861a30256e2de5d6482167fdcbd8401582
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -28,10 -28,7 +28,10 @@@ Build-Depends: debhelper (>= 12)
   iproute2 <!nocheck>,
   socat <!nocheck>,
   libguestfs-tools <!nocheck>,
- Standards-Version: 4.3.0
 + genisoimage
 +Build-Conflicts:
 + ocaml-base-nox
+ Standards-Version: 4.4.0
  Homepage: https://github.com/libguestfs/nbdkit
  Vcs-Git: https://salsa.debian.org/debian/nbdkit.git
  Vcs-Browser: https://salsa.debian.org/debian/nbdkit