From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 5 Nov 2017 16:09:47 +0000 (+0000)
Subject: Merge version 0.4.0+git26-gf8d3149-2+rpi1 and 0.4.1-1 to produce 0.4.1-1+rpi1
X-Git-Tag: archive/raspbian/0.4.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=710b8e824482320cfb2797f2b25d15fcfcf193a1;p=nipy.git

Merge version 0.4.0+git26-gf8d3149-2+rpi1 and 0.4.1-1 to produce 0.4.1-1+rpi1
---

710b8e824482320cfb2797f2b25d15fcfcf193a1
diff --cc debian/changelog
index 2190ffa,34e7f35..89180ca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- nipy (0.4.0+git26-gf8d3149-2+rpi1) buster-staging; urgency=medium
++nipy (0.4.1-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 04 Nov 2017 03:07:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Nov 2017 16:09:47 +0000
++
+ nipy (0.4.1-1) unstable; urgency=medium
+ 
+   * Fresh upstream release
+     - should resolve some failing tests (Closes: #848745)
+     - dropping absorbed changeset* patches
+ 
+  -- Yaroslav Halchenko <debian@onerussian.com>  Sun, 30 Jul 2017 21:20:58 -0400
  
  nipy (0.4.0+git26-gf8d3149-2) unstable; urgency=medium