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

diff --cc debian/changelog
index d93fb43577e1f5427f2f96a66e6bcd30b2e31341,dd3c02d10608107db8f82b28ddf472a4f0613941..89f1313734b3b489a4fbe19e88638741ca91e16d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- ostree (2018.2-1+rpi1) buster-staging; urgency=medium
++ostree (2018.4-1+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>  Thu, 01 Mar 2018 05:46:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 30 Mar 2018 13:25:40 +0000
++
+ ostree (2018.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Update symbols file
+   * Drop all patches, including one that was previously considered to
+     be Debian-specific (moving to Python 3 for tests)
+   * d/copyright: Update
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 24 Mar 2018 19:20:08 +0000
  
  ostree (2018.2-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge