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

diff --cc debian/changelog
index e77f262e4e4858707a9228dcfa4fa3a4c8b7d75d,7de7df43d0b478662948ce0106ebd3d0f909f267..48049bcdce1e615b7bc2edb7a7f68381db944f11
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,27 @@@
- openblas (0.3.20+ds-1+rpi1) bookworm-staging; urgency=medium
++openblas (0.3.20+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>  Sun, 27 Feb 2022 10:04:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 May 2022 14:39:26 +0000
++
+ openblas (0.3.20+ds-2) unstable; urgency=medium
+ 
+   * Remove deprecated xCOMBSSQ lapack routines. (Closes: #1011386)
+   * Remove bin:libjulia-openblas64, which is no longer needed.
+     Exporting libopenblas64_.so with SYMBOLSUFFIX=64_ in Julia private
+     library as an external dependency introduces complication in Julia
+     package compiling process. We currently do not have proposal to
+     put libopenblas64_.so (with symbol suffix) in the public library,
+     because that will eventually lead to NINE variants to build for amd64:
+     (1) LP64 (32-bit indexing), three threading models, default;
+     (2) ILP64 (64-bit indexing), three threading models, no symbol suffix;
+     (3) ILP64 (64-bit indexing), three threading models, symbols suffix 64_.
+     Currently we only provide the (1) and (2) combinations, because BLAS
+     libraries without symbol mangling can still be alternated to e.g. MKL.
+ 
+  -- Mo Zhou <lumin@debian.org>  Sat, 21 May 2022 16:25:13 -0400
  
  openblas (0.3.20+ds-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 08a7b254683687f0783c259eec562f548dec277f,6796f35a282122e15be461fb2d70cd220509cf76..f58bc306e4dd758ae9e2f78bb0c9244b8467eef4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,5 -4,4 +3,5 @@@ remove-openmp-warning.patc
  no-embedded-lapack.patch
  shared-blas-lapack.patch
  matgen-symbols-not-included.patch
- gensymbols-fix-detect-netlib.patch
+ combssq-deprecate.patch
 +auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053