diff -Nru nbdkit-1.2.2/debian/changelog nbdkit-1.2.2/debian/changelog
--- nbdkit-1.2.2/debian/changelog	2018-05-06 20:05:26.000000000 +0000
+++ nbdkit-1.2.2/debian/changelog	2018-05-15 07:21:10.000000000 +0000
@@ -1,3 +1,12 @@
+nbdkit (1.2.2-2+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
+
 nbdkit (1.2.2-2) unstable; urgency=medium
 
   * Add ruby build-dependency (Closes: #897546)
diff -Nru nbdkit-1.2.2/debian/control nbdkit-1.2.2/debian/control
--- nbdkit-1.2.2/debian/control	2018-05-06 20:04:49.000000000 +0000
+++ nbdkit-1.2.2/debian/control	2018-05-15 07:21:10.000000000 +0000
@@ -15,6 +15,8 @@
  libselinux1-dev,
  libvirt-dev,
  zlib1g-dev,
+ linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
+ linux-image-rpi [armhf] <!nocheck> | linux-image-rpi2 [armhf] <!nocheck>,
  linux-image-arm64 [arm64] <!nocheck>,
  linux-image-amd64 [amd64] <!nocheck>,
  linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] | linux-image-486 [i386] <!nocheck>,
diff -Nru nbdkit-1.2.2/debian/rules nbdkit-1.2.2/debian/rules
--- nbdkit-1.2.2/debian/rules	2018-04-22 10:23:59.000000000 +0000
+++ nbdkit-1.2.2/debian/rules	2018-05-15 07:21:10.000000000 +0000
@@ -34,3 +34,8 @@
 # - pkg-has-shlibs-control-file-but-no-actual-shared-libs
 # - post{inst,rm}-has-useless-call-to-ldconfig
 override_dh_makeshlibs:
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f tests/test1.img
+	rm -f tests/file-data tests/pki/ca-cert.pem tests/pki/ca-key.pem tests/pki/ca.info tests/pki/client-cert.pem tests/pki/client-key.pem tests/pki/client.info tests/pki/server-cert.pem tests/pki/server-key.pem tests/pki/server.info