From: Raspbian automatic forward porter Date: Tue, 3 Sep 2019 17:47:12 +0000 (+0100) Subject: Merge version 1.12.4-1+rpi1 and 1.14.0-1 to produce 1.14.0-1+rpi1 X-Git-Tag: archive/raspbian/1.14.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af227fd7fb65a1d1ac49807a49493566f6114105;p=nbdkit.git Merge version 1.12.4-1+rpi1 and 1.14.0-1 to produce 1.14.0-1+rpi1 --- af227fd7fb65a1d1ac49807a49493566f6114105 diff --cc debian/changelog index 257a11b,79db3ec..2b38a88 --- a/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 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 Thu, 01 Aug 2019 20:03:28 +0000 ++ -- Raspbian forward porter 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 Thu, 29 Aug 2019 12:45:13 +0200 nbdkit (1.12.4-1) unstable; urgency=medium