Merge version 1:1.34.6-7+rpi1 and 1:1.36.11-2 to produce 1:1.36.11-2+rpi1

diff --cc debian/changelog
index 3a028365751ddc19f042e29275b421b5af7a1fe9,0ea46705319b578445a72f260eba76e75a2c6f66..fb6aac69f4d1a82663687f563fedc12f3db86464
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,84 +1,88 @@@
- libguestfs (1:1.34.6-7+rpi1) buster-staging; urgency=medium
++libguestfs (1:1.36.11-2+rpi1) buster-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Sep 2017 19:15:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 22 Jan 2018 04:00:21 +0000
++
+ libguestfs (1:1.36.11-2) unstable; urgency=medium
+ 
+   * e2fsprogs: Add to Build-Depends, don't filter from appliance
+     dependencies (Closes: Closes: #887171, #887203, #887215, #887217,
+     #887220, #887219, #887244, #887259, #887268, #887269, #887271,
+     #887279, #887288, #887289, #887291, #887296, #887280, #887302)
+   * Catch errors in any of the "make install" runs
+   * Fix install target for php extension
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 15 Jan 2018 14:04:59 +0100
+ 
+ libguestfs (1:1.36.11-1) unstable; urgency=medium
+ 
+   * New upstream version 1.36.11
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 10 Dec 2017 01:44:17 +0100
+ 
+ libguestfs (1:1.36.10-1) unstable; urgency=medium
+ 
+   * New upstream version 1.36.10
+   * Change Priority to optional
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 20 Oct 2017 21:08:12 +0200
+ 
+ libguestfs (1:1.36.7-2) unstable; urgency=medium
+ 
+   [ Nicholas D Steeves ]
+   * Change Build-Depends: btrfs-tools to btrfs-progs (Closes: #878916)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 17 Oct 2017 21:13:22 +0200
+ 
+ libguestfs (1:1.36.7-1) unstable; urgency=medium
+ 
+   * New upstream version 1.36.7
+   * Drop buildsystem patches that have been integrated upstream
+   * Bump Standards-Version
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 04 Oct 2017 20:49:02 +0200
+ 
+ libguestfs (1:1.36.6-4) unstable; urgency=medium
+ 
+   * Fix --disable-ocaml related FTBFS found on ppc64el autobuilder
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 26 Sep 2017 17:56:07 +0200
+ 
+ libguestfs (1:1.36.6-3) unstable; urgency=medium
+ 
+   * Add patch to fix FTBFS because builddir != srcdir
+   * Remove gtk-doc from .install file
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 25 Sep 2017 21:08:04 +0200
+ 
+ libguestfs (1:1.36.6-2) unstable; urgency=medium
+ 
+   * Fix rules syntax error
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 25 Sep 2017 19:54:47 +0200
+ 
+ libguestfs (1:1.36.6-1) unstable; urgency=medium
+ 
+   * New upstream version 1.36.6
+   * Add more test blobs to source lintian overrides ("source-is-missing")
+   * Add QEMU options for powerpcspe
+   * Remove building gtk documentation becasue gtkdoc-mktmpl has
+     disappeared with gtk-doc-tools 1.26
+   * Rebase patches
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 25 Sep 2017 15:41:56 +0200
+ 
+ libguestfs (1:1.36.5-1) unstable; urgency=medium
+ 
+   * New upstream version 1.36.5
+   * Rework debian/rules to reduce number of configure/make/install
+     cycles, drop -dbg package
+   * Rebase patches
+   * Update .symbols
+   * Update Build-Dependencies
+   * Add missing dependency to libguestfs-gobject-dev
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 07 Sep 2017 12:34:03 +0200
  
  libguestfs (1:1.34.6-7) unstable; urgency=medium
  

diff --cc debian/control
Simple merge