Merge version 0.3.18+ds-1+rpi1 and 0.3.18+ds-2 to produce 0.3.18+ds-2+rpi1

diff --cc debian/changelog
index 0724950530b13f805b370b7db9da212a2461e52a,3fc4db263807bc50c55987ed901ffde87bb9fcfb..9a0c51ecb75ce4652812def5b5976d4d78377f35
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- openblas (0.3.18+ds-1+rpi1) bookworm-staging; urgency=medium
++openblas (0.3.18+ds-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0.2.15-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 11 Mar 2016 23:39:32 +0000]
 +  * Disable arm-gcc-flags.patch which was enforcing gcc flags that are wrong
 +    for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Oct 2021 14:56:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 03 Nov 2021 00:27:51 +0000
++
+ openblas (0.3.18+ds-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Revert invalid trsv shortcut. Fixes crash in yade-package.
+ 
+  -- Anton Gladky <gladk@debian.org>  Sat, 30 Oct 2021 02:01:09 +0200
  
  openblas (0.3.18+ds-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 08a7b254683687f0783c259eec562f548dec277f,c7ac22220ab93ac587dae2a26e2c4a22123652ff..162a814f291877025acbe149ec6e2c1601db3ce3
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -4,4 -5,4 +4,5 @@@ no-embedded-lapack.patc
  shared-blas-lapack.patch
  matgen-symbols-not-included.patch
  gensymbols-fix-detect-netlib.patch
+ 3422.patch
 +auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053