From: Raspbian forward pporter <root@raspbian.org>
Date: Mon, 19 Jun 2017 02:26:49 +0000 (+0000)
Subject: Merge version 0.18-4+rpi1 and 0.18-5 to produce 0.18-5+rpi1
X-Git-Tag: archive/raspbian/0.18-5+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b63b4bb430aba379d1c2752a91e5a2c00f194f9;p=scikit-learn.git.old

Merge version 0.18-4+rpi1 and 0.18-5 to produce 0.18-5+rpi1
---

d47e5e6606beb4ff04f2ca71e461e0f35dedfedd
diff --cc debian/changelog
index 68a83d9,2249add..9ab16fe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- scikit-learn (0.18-4+rpi1) stretch-staging; urgency=medium
++scikit-learn (0.18-5+rpi1) stretch-staging; urgency=medium
 +
++  [changes brought forward from 0.18-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Nov 2016 15:34:29 +0000]
 +  * Disable testsuite
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Nov 2016 15:34:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Jun 2017 02:26:49 +0000
++
+ scikit-learn (0.18-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * Moved packaging to Debian Science team
+   * Build-Depends: python-pytest, python3-pytest
+     Closes: #848788
+ 
+  -- Andreas Tille <tille@debian.org>  Wed, 28 Dec 2016 13:24:45 +0100
  
  scikit-learn (0.18-4) unstable; urgency=medium