Merge version 0.11.3-3+rpi1 and 0.11.5-1 to produce 0.11.5-1+rpi1

diff --cc debian/changelog
index be6abf892cac747c4bcf694c09a6a4fe707d35f3,2ef540bd58b9e18b3978c2820d78954ad4486dd9..10a23a4b7f05fae75b3eb76e504c4be113d5f484
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,25 +1,32 @@@
- flatpak (0.11.3-3+rpi1) buster-staging; urgency=medium
++flatpak (0.11.5-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 0.11.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Mar 2018 09:31:06 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 17 Mar 2018 09:31:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 May 2018 15:25:00 +0000
++
+ flatpak (0.11.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * d/p/make-test-runtime-Look-in-usr-sbin-for-ldconfig.patch:
+     Use an upstreamable patch to detect /sbin/ldconfig in tests, instead
+     of working around lack of /sbin in PATH in Debian test scripts
+   * d/p/parse-datetime-Build-YACC-parser-from-source.patch:
+     Force parse-datetime.c to be build from source using bison
+ 
+  -- Simon McVittie <smcv@debian.org>  Mon, 30 Apr 2018 15:27:33 +0100
+ 
+ flatpak (0.11.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - Drop patches that were applied upstream
+     - d/copyright: Update
+     - Build-depend on bison
+     - Add new flatpak-portal to flatpak.deb
+     - Update symbols file for new ABI
+   * Standards-Version: 4.1.4 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 26 Apr 2018 20:06:07 +0100
  
  flatpak (0.11.3-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge