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

diff --cc debian/changelog
index 0b0a2f00794c37e6aa2c824e23141c771bedd111,f975b532c8de1ee6f99e45a9c72872c450603cf4..794516b4165dbf0199845b4e6713fa9fd9ff2382
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- ostree (2018.8-1+rpi1) buster-staging; urgency=medium
++ostree (2018.8-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>  Sat, 25 Aug 2018 19:00:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Oct 2018 17:09:09 +0000
++
+ ostree (2018.8-2) unstable; urgency=medium
+ 
+   [ Simon McVittie ]
+   * ostree-tests: Remove gjs dependency on s390x.
+     mozjs60 doesn't work on s390x, so gjs is in danger of being removed
+     from that architecture (see #909536). The test that uses JS is
+     automatically skipped if the interpreter is missing.
+     (Closes: #910286)
+   * Standards-Version: 4.2.1 (no changes required)
+ 
+   [ Ondřej Nový ]
+   * d/tests: Use AUTOPKGTEST_TMP instead of ADTTMP
+   * d/changelog: Remove trailing whitespaces
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 04 Oct 2018 14:54:29 +0100
  
  ostree (2018.8-1) unstable; urgency=medium