Merge version 0.10.1-1+rpi1 and 0.10.2.1-1 to produce 0.10.2.1-1+rpi1

diff --cc debian/changelog
index 95194fefc43be5a98c993344395abced3397ba91,05f431b545a130f7f8a276ad3c002fe456c10e59..091f7f1df3f00ec2a53f64136f6887ee11a41671
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- flatpak (0.10.1-1+rpi1) buster-staging; urgency=medium
++flatpak (0.10.2.1-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 0.10.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 01 Nov 2017 23:21:56 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Dec 2017 03:04:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Dec 2017 03:14:00 +0000
++
+ flatpak (0.10.2.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 21 Dec 2017 14:00:52 +0000
+ 
+ flatpak (0.10.2-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - d/control: Be specific about the appstream-glib dependency,
+       which is newer than oldstable
+     - d/control: Update build-dependency on ostree to 2017.14
+   * Standards-Version: 4.1.2 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 15 Dec 2017 15:26:30 +0000
  
  flatpak (0.10.1-1) unstable; urgency=medium