Merge version 1.8.1-20+rpi1 and 1.8.1-21 to produce 1.8.1-21+rpi1

diff --cc debian/changelog
index 0effef15c43a398164bb76e7a07b32d563416324,3c6dbb9f3f503af841de8a033d2cf92a387f1407..e33050c85e676b1d2cbf88922e24e9adca06d1bd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- scipy (1.8.1-20+rpi1) bookworm-staging; urgency=medium
++scipy (1.8.1-21+rpi1) bookworm-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>  Fri, 20 Jan 2023 02:02:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Jan 2023 04:51:47 +0000
++
+ scipy (1.8.1-21) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian patch fix_numpy1.24_PR17035.patch applies upstream PR17035
+     to fix build with numpy 1.24. Closes: #1027244
+ 
+  -- Drew Parsons <dparsons@debian.org>  Thu, 19 Jan 2023 14:54:51 +0100
  
  scipy (1.8.1-20) unstable; urgency=medium