From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 18 Jan 2019 12:21:24 +0000 (+0000)
Subject: Merge version 0.4.2-1+rpi1 and 0.4.2-2 to produce 0.4.2-2+rpi1
X-Git-Tag: raspbian/0.4.2-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd60a0b2b332acffef6f9b5cf1df5a87b0bbc660;p=nipy.git

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

06aa8c6ad9c57d87cead9775a7f7342ffac9d2d1
diff --cc debian/changelog
index 3eb73e3,31a5df4..ed8b89b
--- a/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