Manual merge of version 1.1.25-1+rpi1 and 1.1.28-3 to produce 1.1.28-3+rpi1

diff --cc debian/changelog
index 34330cd57149a976ae326030973c3b21b4b13479,d305776a2d542557947a5055dab30c2200cb6a80..bdb660fcdf7619634898eb27cfaa4e3ad1cb0e25
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,26 +1,35 @@@
- nbdkit (1.1.25-1+rpi1) buster-staging; urgency=medium
++nbdkit (1.1.28-3+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>  Thu, 11 Jan 2018 19:46:24 +0000
++ -- Peter Michael green <plugwash@raspbian.org>  Fri, 16 Feb 2018 03:33:01 +0000
++
+ nbdkit (1.1.28-3) unstable; urgency=medium
+ 
+   * Document the need for linux-image-* build dependencies
+     (Closes: #888182)
+   * Disable some build dependencies for the nocheck build profile
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 06 Feb 2018 18:59:38 +0100
+ 
+ nbdkit (1.1.28-2) unstable; urgency=medium
+ 
+   * Disable tests on armhf, mips64el for now
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jan 2018 21:47:12 +0100
+ 
+ nbdkit (1.1.28-1) unstable; urgency=medium
+ 
+   * New upstream version 1.1.28
+   * Bump Standards-Version
+   * Drop patches related to NBD/QEMU test breakage, add versioned libguestfs
+     build-dependency instead
+   * Add entries to .install files: filters, pkg-config file
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jan 2018 10:27:03 +0100
  
  nbdkit (1.1.25-1) unstable; urgency=medium
  

diff --cc debian/control
index a915c50326b01856218d89a680497ee496c5a737,5952f6a3954345adc9fd74390865de13b8a29738..1c80e9ea4042a7b3958a53132d05656bcd6cf564
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -26,10 -12,24 +12,24 @@@ Build-Depends: debhelper (>= 10~)
   libperl-dev,
   python-dev,
   ruby-dev,
-  iproute2, socat, libguestfs-tools,
- Build-Conflicts:
-  ocaml-base-nox
- Standards-Version: 4.1.2
+  libselinux1-dev,
+  libvirt-dev,
+  zlib1g-dev,
+  linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
 - linux-image-armmp [armhf] <!nocheck>,
++ linux-image-rpi [armhf] <!nocheck> | linux-image-rpi2 [armhf] <!nocheck>, 
+  linux-image-arm64 [arm64] <!nocheck>,
+  linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel mips64 mips64el] <!nocheck>,
+  linux-image-s390x [s390x] <!nocheck>,
+  linux-image-powerpc64 [powerpc ppc64] <!nocheck>,
+  linux-image-powerpc64le [ppc64el] <!nocheck>,
+  linux-image-sparc64 [sparc] <!nocheck>,
+  linux-image-amd64 [amd64] <!nocheck>,
+  linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] | linux-image-486 [i386] <!nocheck>,
+  busybox <!nocheck>,
+  iproute2 <!nocheck>,
+  socat <!nocheck>,
+  libguestfs-tools <!nocheck>,
+ Standards-Version: 4.1.3
  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

diff --cc debian/rules
Simple merge