Manual merge of version 1:1.34.3-6+rpi1 and 1:1.34.3-7 to produce 1:1.34.3-7+rpi1

diff --cc debian/changelog
index 216ff31b6d2837f11369e8cb28e3b34e4e8f9edb,5cea1ee5b9458c0969a044c84f1779e1a00394f9..3e1fdd37d4e4163061c83f7120e8d372d012fb65
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- libguestfs (1:1.34.3-6+rpi1) stretch-staging; urgency=medium
++libguestfs (1:1.34.3-7+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1:1.32.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 16 Aug 2016 01:41:53 +0000]
 +  * Change kernel build-dep for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jan 2017 09:40:43 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Jan 2017 16:26:23 +0000
++
+ libguestfs (1:1.34.3-7) unstable; urgency=medium
+ 
+   * Introduce alternative kernel build-dependency (Closes: #851969)
+   * Add dh-python build-dependency
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 22 Jan 2017 15:43:37 +0100
  
  libguestfs (1:1.34.3-6) unstable; urgency=medium
  

diff --cc debian/control
index 1deb23dcc81f49b05acb2e60b2db22f3272000d2,0aa3f25f4d8f2c104e7ae9b09f9df3ef9af2eaac..6f69acacaf1f4489bd80438ea5a40580e3fdb16c
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -45,8 -46,8 +46,8 @@@ Build-Depends: debhelper (>= 9)
    golang-go [i386 amd64 armel armhf arm64 ppc64el],
    dh-php, php-all-dev | php5-dev,
  # for appliance
-   linux-image-versatile [armel],
+   linux-image-marvell [armel] | linux-image-versatile [armel],
 -  linux-image-armmp [armhf],
 +  linux-image-rpi [armhf],
    linux-image-arm64 [arm64],
    linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel mips64 mips64el],
    linux-image-s390x [s390x],