Merge version 3.0.0-2+rpi1 and 3.1.0-3 to produce 3.1.0-3+rpi1

diff --cc debian/changelog
index c90577632b0d47c186eda612f3ed3197bca7d99d,9c32224457769325da354c34f23ea7f39eab3f2a..c16b57c4ec60ad135910db356006787b09ef332f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,30 +1,40 @@@
- volk (3.0.0-2+rpi1) trixie-staging; urgency=medium
++volk (3.1.0-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
 +  * Disable neon.
 +
 +  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
 +  * Add bulid-depends-indep on texlive-latex-extra.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Sep 2023 14:03:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Dec 2023 13:11:22 +0000
++
+ volk (3.1.0-3) unstable; urgency=medium
+ 
+   * add powerpc to cpu-features dependency
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sat, 16 Dec 2023 09:31:28 -0500
+ 
+ volk (3.1.0-2) unstable; urgency=medium
+ 
+   * Avoid ORC on x32, led to test failures
+   * include argilo-volk/all-i386-patches
+   * update available cpu-features architecture list
+   * Express version information in decimal
+   * add debian/upstream/metadata
+   * clean __pycahe__ (Closes: #1048046)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Fri, 15 Dec 2023 17:57:14 -0500
+ 
+ volk (3.1.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+     Improved CMake build
+     Better tests
+     New kernel API (old API still available)
+     New and Updated kernels
+   * Upload to experimental for soversion bump
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 05 Dec 2023 18:12:20 -0500
  
  volk (3.0.0-2) unstable; urgency=medium
  

diff --cc debian/control
index b42446b05d6c4d7c438dec5ab51e0806663e6527,a104ede8ecac9e385342f0d665748f2707d41236..b68db691e6eae35319b0645151944438d0907967
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -5,11 -5,11 +5,11 @@@ Maintainer: A. Maitland Bottoms <bottom
  Build-Depends: cmake,
                 debhelper-compat (= 13),
                 dh-python,
-                liborc-0.4-dev,
-                libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el x32],
-              python3-dev,
-              python3-mako
+                libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x powerpc x32],
+                liborc-0.4-dev [!x32],
+                python3-dev,
+                python3-mako
 -Build-Depends-Indep: doxygen, graphviz
 +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
  Standards-Version: 4.6.2
  Rules-Requires-Root: no
  Homepage: https://libvolk.org

diff --cc debian/patches/series
index fb5c150ba87e328ccde02f405892b937b20e2d74,620cb5780cba3269c6de2aa3ef15dae2a57a8fce..42f23cd21064526ff13fe861ad29932359098826
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,11 +1,12 @@@
- 0001-ci-Remove-license-check.patch
- 0002-license-Fix-SPDX-identifiers.patch
- # 0003-Use-cpu_features-on-RISC-V-platforms.patch
- 0004-add-volk_32f_s32f_x2_convert_8u-kernel.patch
- 0005-volk_32f_s32f_convert_8i-code-style.patch
+ 0001-Allow-for-rounding-error-in-float-to-int-conversions.patch
+ 0002-Allow-for-rounding-error-in-volk_32fc_s32f_magnitude.patch
+ 0003-Remove-broken-sse_32-kernels.patch
+ 0004-Fix-flaky-fm_detect-test.patch
+ 0005-Fix-flaky-mod_range-test.patch
+ 0006-Allow-for-rounding-error-in-float-to-int-interleave.patch
+ 0007-Express-version-information-in-decimal.patch
  optional-static-apps
- skip-cpu_features-on-kfreebsd
- # remove-external-HTML-resources
- omit-build-paths
  omit-doxygen-build-paths
  update-doxygen
+ doxygen-pdf
 +disable-neon

diff --cc lib/CMakeLists.txt
Simple merge