Merge version 2.4.1-2+rpi1 and 2.5.0-2 to produce 2.5.0-2+rpi1

diff --cc debian/changelog
index 58574f34a585a002fb34a1e41d17e97ae65e1d67,4d076990c62521215d5c44cce40deb7cc0e23528..e36ea6bea38fe89a984bb4e57d03dd415163b690
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- volk (2.4.1-2+rpi1) bullseye-staging; urgency=medium
++volk (2.5.0-2+rpi1) bookworm-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>  Sun, 03 Jan 2021 14:02:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Oct 2021 17:19:43 +0000
++
+ volk (2.5.0-2) unstable; urgency=medium
+ 
+   * upload to unstable
+   * with some upstream bugfixes
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 21 Oct 2021 23:30:05 -0400
+ 
+ volk (2.5.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Use libcpu-features-dev on powerpc and x32 (Closes: #978602)
+   * Mention volk-config-info and volk_modtool in description (Closes: #989263)
+   * Upload to experimental for soversion bump
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 10 Jun 2021 18:29:47 -0400
  
  volk (2.4.1-2) unstable; urgency=medium
  

diff --cc debian/control
index 94c0539edbf60ac4a688b88ccdce0ed40bd5689b,56a16d2338391e220ba096e968a813024ddf6712..eeb724f0ff6849213cdd76ce7998779e5490897a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,10 -6,10 +6,10 @@@ Build-Depends: cmake
                 debhelper-compat (= 13),
                 dh-python,
                 liborc-0.4-dev,
-                libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64 ppc64el],
+                libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el x32],
               python3-dev,
               python3-mako
 -Build-Depends-Indep: doxygen, graphviz
 +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
  Standards-Version: 4.5.1
  Rules-Requires-Root: no
  Homepage: https://libvolk.org

diff --cc debian/patches/series
Simple merge

diff --cc lib/CMakeLists.txt
Simple merge