Merge version 1.1.16-1+rpi1 and 1.1.25-1 to produce 1.1.25-1+rpi1

diff --cc debian/changelog
index dbfe87e4cad6274b74a2c80882a366bf68870f73,8fae59775f0795fd0b9fda126d41831cd37c14ce..34330cd57149a976ae326030973c3b21b4b13479
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,44 +1,53 @@@
- nbdkit (1.1.16-1+rpi1) buster-staging; urgency=medium
++nbdkit (1.1.25-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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2017 12:09:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jan 2018 19:46:24 +0000
++
+ nbdkit (1.1.25-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.25
+   * Add tar plugin to nbdkit-plugin-perl
+   * Install all examples into nbdkit-plugin-dev
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 07 Dec 2017 09:24:35 +0100
+ 
+ nbdkit (1.1.22-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.22
+   * Add workaround for libguestfs-related FTBFS in tests
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 04 Dec 2017 11:06:23 +0100
+ 
+ nbdkit (1.1.20-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.20
+   * Add split plugin
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 03 Dec 2017 12:51:48 +0100
+ 
+ nbdkit (1.1.19-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.19
+   * Add null, memory plugin
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 01 Dec 2017 09:35:15 +0100
+ 
+ nbdkit (1.1.18-2) unstable; urgency=medium
+ 
+   * Add nbdkit-nbd-plugin to .install file (Closes: #882428)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 22 Nov 2017 23:46:04 +0100
+ 
+ nbdkit (1.1.18-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.18
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 22 Nov 2017 10:09:46 +0100
  
  nbdkit (1.1.16-1) unstable; urgency=medium
  

diff --cc debian/control
index 3884b6c579d1531ced4eb7dc768cab9fb345aaa5,013158c28c6b478e0a6900900eb901b631e1c9a4..a915c50326b01856218d89a680497ee496c5a737
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -27,9 -27,7 +27,9 @@@ Build-Depends: debhelper (>= 10~)
   python-dev,
   ruby-dev,
   iproute2, socat, libguestfs-tools,
- Standards-Version: 4.1.1
 +Build-Conflicts:
 + ocaml-base-nox
+ Standards-Version: 4.1.2
  Homepage: https://github.com/libguestfs/nbdkit
  Vcs-Git: https://anonscm.debian.org/git/collab-maint/nbdkit.git
  Vcs-Browser: https://anonscm.debian.org/git/collab-maint/nbdkit.git