Merge version 2018.4-1+rpi1 and 2018.4-2 to produce 2018.4-2+rpi1

diff --cc debian/changelog
index 89f1313734b3b489a4fbe19e88638741ca91e16d,f877e15b285d03f52cb854b8d43f879956ecdd7e..846836edfdb69ec50c657086cf76fed45fec865a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- ostree (2018.4-1+rpi1) buster-staging; urgency=medium
++ostree (2018.4-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2017.11-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Sep 2017 16:17:06 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 30 Mar 2018 13:25:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Apr 2018 06:23:02 +0000
++
+ ostree (2018.4-2) unstable; urgency=medium
+ 
+   * d/p/Don-t-write-to-parent-repo.patch:
+     Add patch from upstream to prevent trying to write to a parent
+     repository, fixing installation of Flatpak apps and runtimes into
+     the system-wide repository (Closes: #895883)
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 17 Apr 2018 09:06:42 +0100
  
  ostree (2018.4-1) unstable; urgency=medium