From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 16 Dec 2023 08:45:58 +0000 (+0000)
Subject: Merge version 1.10.1-5+rpi1 and 1.10.1-6 to produce 1.10.1-6+rpi1
X-Git-Tag: archive/raspbian/1.10.1-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=18ec1aadf4b0c21363ea621505509521da2cf087;p=scipy.git

Merge version 1.10.1-5+rpi1 and 1.10.1-6 to produce 1.10.1-6+rpi1
---

18ec1aadf4b0c21363ea621505509521da2cf087
diff --cc debian/changelog
index 0b604a49,a3fe167b..757351da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,18 @@@
- scipy (1.10.1-5+rpi1) trixie-staging; urgency=medium
++scipy (1.10.1-6+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.8.1-14+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 26 Sep 2022 01:12:43 +0000]
 +  * Disable testsuite.
 +  * Add build-conflicts on git, the documenation seems to fail to
 +    build if it is installed.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Nov 2023 04:39:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 16 Dec 2023 08:45:57 +0000
++
+ scipy (1.10.1-6) unstable; urgency=medium
+ 
+   * Team upload
+   * Allow building with Python 3.12
+ 
+  -- Graham Inggs <ginggs@debian.org>  Tue, 05 Dec 2023 13:22:12 +0000
  
  scipy (1.10.1-5) unstable; urgency=medium