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

diff --cc debian/changelog
index 257a11bad89472b2e46ab94dd12ac67b14fede4d,79db3ec9c70d6f59b6736c06aa6538848897c2ee..2b38a887688164e867731b633a6aa9a29948acb3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- nbdkit (1.12.4-1+rpi1) bullseye-staging; urgency=medium
++nbdkit (1.14.0-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, 01 Aug 2019 20:03:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Sep 2019 17:47:12 +0000
++
+ nbdkit (1.14.0-1) unstable; urgency=medium
+ 
+   * New upstream version 1.14.0
+   * Update patches
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 29 Aug 2019 12:45:13 +0200
  
  nbdkit (1.12.4-1) unstable; urgency=medium