From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 22 Jun 2018 04:07:21 +0000 (+0100)
Subject: Merge version 1.2.2-2+rpi1 and 1.2.4-1 to produce 1.2.4-1+rpi1
X-Git-Tag: archive/raspbian/1.2.4-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10a977328db4a276100de360541b4df80dede289;p=nbdkit.git

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

10a977328db4a276100de360541b4df80dede289
diff --cc debian/changelog
index 93ee317,d15f627..f26ff0a
--- a/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