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

diff --cc debian/changelog
index 846836edfdb69ec50c657086cf76fed45fec865a,a6109cfd456e5ff41416aa7839275a453a39d27d..1caeaa7dd5ff9059919b48913908967723f4c996
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- ostree (2018.4-2+rpi1) buster-staging; urgency=medium
++ostree (2018.5-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, 26 Apr 2018 06:23:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 May 2018 21:16:19 +0000
++
+ ostree (2018.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - d/copyright: Upstream clarified that only doc/ is CC-BY-SA-3.0 or
+       GFDL-1.3-or-later, and doc/ isn't included in dist tarballs, so
+       remove those licenses
+     - d/libostree-1-1.symbols: Update (and sort)
+     - d/p/Don-t-write-to-parent-repo.patch: Drop, applied upstream
+     - d/ostree-boot.install: Add new systemd service
+       lib/systemd/system/ostree-finalize-staged.service
+     - d/rules: Remove lib/systemd/system/ostree-finalize-staged.service
+       until we build ostree-boot
+   * ostree-tests: Add Lintian override for library-not-linked-against-libc.
+     libreaddir-rand.so genuinely doesn't use any libc ABIs directly, only
+     via GLib.
+   * Standards-Version: 4.1.4 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 15 May 2018 11:30:03 +0100
  
  ostree (2018.4-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge