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

diff --cc debian/changelog
index 091f7f1df3f00ec2a53f64136f6887ee11a41671,98f6c63746d47fc9e4c87df0dbfb3d06b864f599..e56a6f5b97bca9092ba0ab09d242a257fac4b0a1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- flatpak (0.10.2.1-1+rpi1) buster-staging; urgency=medium
++flatpak (0.10.2.1-2+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>  Thu, 28 Dec 2017 03:14:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jan 2018 08:41:50 +0000
++
+ flatpak (0.10.2.1-2) unstable; urgency=medium
+ 
+   * Move Vcs-* to salsa.debian.org
+   * Standards-Version: 4.1.3 (no changes required)
+   * d/control, d/tests/control,
+     d/p/debian/Use-Python-3-for-test-web-server.patch:
+     Use Python 3 for tests
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 17 Jan 2018 20:55:34 +0000
  
  flatpak (0.10.2.1-1) unstable; urgency=medium