From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 15 Oct 2019 13:26:49 +0000 (+0100)
Subject: Merge version 1.14.0-1+rpi1 and 1.14.2-2 to produce 1.14.2-2+rpi1
X-Git-Tag: archive/raspbian/1.14.2-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8dd25aa1fdc2990d0dc94982e577bf67fb08f777;p=nbdkit.git

Merge version 1.14.0-1+rpi1 and 1.14.2-2 to produce 1.14.2-2+rpi1
---

8dd25aa1fdc2990d0dc94982e577bf67fb08f777
diff --cc debian/changelog
index 2b38a88,3a3d578..682f6d8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,38 @@@
- nbdkit (1.14.0-1+rpi1) bullseye-staging; urgency=medium
++nbdkit (1.14.2-2+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>  Tue, 03 Sep 2019 17:47:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 Oct 2019 13:26:49 +0000
++
+ nbdkit (1.14.2-2) unstable; urgency=medium
+ 
+   * Remove libnbd-dev build-dependency for now (Closes: #941935)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 08 Oct 2019 00:15:28 +0200
+ 
+ nbdkit (1.14.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.14.2
+   * Correct Build-Depends typo
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 21 Sep 2019 12:35:41 +0200
+ 
+ nbdkit (1.14.1-1) unstable; urgency=medium
+ 
+   * New upstream version 1.14.1
+   * Rebase patch
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 13 Sep 2019 08:23:32 +0200
+ 
+ nbdkit (1.14.0-2) unstable; urgency=medium
+ 
+   * Update build-dependencies
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 09 Sep 2019 20:44:47 +0200
  
  nbdkit (1.14.0-1) unstable; urgency=medium
  
diff --cc debian/control
index c5af738,e47434b..d3bc204
--- a/debian/control
+++ b/debian/control
@@@ -26,11 -26,9 +26,12 @@@ Build-Depends: debhelper (>= 12)
   linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] | linux-image-486 [i386] <!nocheck>,
   busybox <!nocheck>,
   iproute2 <!nocheck>,
+  jq <!nocheck>,
   socat <!nocheck>,
   libguestfs-tools <!nocheck>,
 + 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