From: Raspbian forward pporter Date: Tue, 31 Jan 2017 16:26:27 +0000 (+0000) Subject: Manual merge of version 1:1.34.3-6+rpi1 and 1:1.34.3-7 to produce 1:1.34.3-7+rpi1 X-Git-Tag: archive/raspbian/1%1.34.3-7+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=72c5f32cfaa5fab69ba3b9d70e025c4694d14a05;p=libguestfs.git Manual merge of version 1:1.34.3-6+rpi1 and 1:1.34.3-7 to produce 1:1.34.3-7+rpi1 --- 72c5f32cfaa5fab69ba3b9d70e025c4694d14a05 diff --cc debian/changelog index 216ff31b,5cea1ee5..3e1fdd37 --- a/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 at Tue, 16 Aug 2016 01:41:53 +0000] + * Change kernel build-dep for raspbian. + - -- Raspbian forward porter Sat, 21 Jan 2017 09:40:43 +0000 ++ -- Peter Michael Green 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 Sun, 22 Jan 2017 15:43:37 +0100 libguestfs (1:1.34.3-6) unstable; urgency=medium diff --cc debian/control index 1deb23dc,0aa3f25f..6f69acac --- a/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],