From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 18 Sep 2018 12:39:47 +0000 (+0100)
Subject: Merge version 1.0.1-1+rpi1 and 1.0.2-1 to produce 1.0.2-1+rpi1
X-Git-Tag: archive/raspbian/1.0.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e460d4ee2f390f8df7a49ca09e7d96cbdf4f3ac8;p=flatpak.git

Merge version 1.0.1-1+rpi1 and 1.0.2-1 to produce 1.0.2-1+rpi1
---

e460d4ee2f390f8df7a49ca09e7d96cbdf4f3ac8
diff --cc debian/changelog
index c7b8530,2846c85..66266e9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,19 @@@
- flatpak (1.0.1-1+rpi1) buster-staging; urgency=medium
++flatpak (1.0.2-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 1.0.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 16 Sep 2018 01:04:13 +0000]
 +  * Disable testsuite, it seems to fail on our wandboards (but not on our lxc
 +    based autobuilders).
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Sep 2018 01:04:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Sep 2018 12:39:47 +0000
++
+ flatpak (1.0.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * d/p/debian/patches/test-webserver-Fix-race-condition.patch:
+     Mark as forwarded
+   * d/libflatpak0.symbols: Update
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 15 Sep 2018 11:41:26 +0100
  
  flatpak (1.0.1-1) unstable; urgency=medium