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

diff --cc debian/changelog
index ef8b7d4bf6878c925510bdace8cb0f84b1e663ed,fb6d48f541ca30ff1c55cafc117b1759e939c442..48f2d29a4a6727647701b0c1426fca996dfc6e54
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,16 @@@
- python-astropy (2.0.2-1+rpi1) buster-staging; urgency=medium
++python-astropy (2.0.2-2+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 2.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 03 Nov 2017 23:08:32 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 03 Nov 2017 23:08:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Dec 2017 04:43:36 +0000
++
+ python-astropy (2.0.2-2) unstable; urgency=medium
+ 
+   * Push Standards-Version to 4.1.2. Change remaining URLs to use https
+   * Otherwise unchanged upload for python3.6 transition. Closes: #883403
+ 
+  -- Ole Streicher <olebole@debian.org>  Tue, 05 Dec 2017 11:16:34 +0100
  
  python-astropy (2.0.2-1) unstable; urgency=medium