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

diff --cc debian/changelog
index 3eb73e3f5ea121cc531e374281187e2ea59886b8,31a5df4e46e25702218eaa6cc9ecca3a3097b951..ed8b89b1e570391be5a4dabddd148fc1ef62c0bc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- nipy (0.4.2-1+rpi1) buster-staging; urgency=medium
++nipy (0.4.2-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 0.4.0+git26-gf8d3149-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 04 Nov 2017 03:07:42 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Mar 2018 06:12:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Jan 2019 12:21:24 +0000
++
+ nipy (0.4.2-2) unstable; urgency=medium
+ 
+   * Cherry picked a number of fixes from upstream/PRs to become a part of the
+     next release (Closes: #906388)
+   * debian/control
+     - fixed up Vcs fields to point to salsa
+ 
+  -- Yaroslav Halchenko <debian@onerussian.com>  Thu, 10 Jan 2019 11:05:31 -0500
  
  nipy (0.4.2-1) unstable; urgency=medium