Merge version 0.3.28+ds-3+rpi1 and 0.3.28+ds-4 to produce 0.3.28+ds-4…

…+rpi1

debian/changelog

@@ -1,10 +1,17 @@
-openblas (0.3.28+ds-3+rpi1) trixie-staging; urgency=medium
+openblas (0.3.28+ds-4+rpi1) trixie-staging; urgency=medium
 
   [changes brought forward from 0.2.15-1+rpi1 by Peter Michael Green <[email protected]> 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 <[email protected]>  Wed, 13 Nov 2024 10:04:22 +0000
+ -- Raspbian forward porter <[email protected]>  Tue, 10 Dec 2024 19:23:06 +0000
+
+openblas (0.3.28+ds-4) unstable; urgency=medium
+
+  * pkg-config-libsuffix.patch: new patch, fixes pkg-config for 64-bit flavours
+    (Closes: #1087874)
+
+ -- Sébastien Villemot <[email protected]>  Wed, 20 Nov 2024 11:52:32 +0100
 
 openblas (0.3.28+ds-3) unstable; urgency=medium
 

debian/patches/pkg-config-libsuffix.patch

@@ -0,0 +1,18 @@
+Description: Restore libsuffix support in pkg-config file
+ This is needed for 64-bit flavours.
+Author: Sébastien Villemot <[email protected]>
+Bug-Debian: https://bugs.debian.org/1087874
+Forwarded: https://github.com/OpenMathLib/OpenBLAS/pull/4982
+Last-Update: 2024-11-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/openblas.pc.in
++++ b/openblas.pc.in
+@@ -2,6 +2,6 @@ Name: openblas
+ Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version
+ Version: ${version}
+ URL: https://github.com/xianyi/OpenBLAS
+-Libs: -L${libdir} -l${libprefix}openblas${libnamesuffix}
++Libs: -L${libdir} -l${libprefix}openblas${libnamesuffix}${libsuffix}
+ Libs.private: ${extralib}
+ Cflags: -I${includedir}

debian/patches/series

@@ -5,4 +5,5 @@ matgen-symbols-not-included.patch
 combssq-deprecate.patch
 gcc14-mips64el.patch
 openblas-Fixed-undefined-reference-to-blas_set_parameter.patc
+pkg-config-libsuffix.patch
 auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053

openblas.pc.in

@@ -2,6 +2,6 @@ Name: openblas
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version
 Version: ${version}
 URL: https://github.com/xianyi/OpenBLAS
-Libs: -L${libdir} -l${libprefix}openblas${libnamesuffix}
+Libs: -L${libdir} -l${libprefix}openblas${libnamesuffix}${libsuffix}
 Libs.private: ${extralib}
 Cflags: -I${includedir}