Merge version 2.5.1-1+rpi1 and 2.5.1-2 to produce 2.5.1-2+rpi1

diff --cc debian/changelog
index e2b472fe411726a8bc44f8aa1a59ba609eebcdb8,a8abae54ff74e3f1c0801a4fb6f5c7cb684b5866..f911d00f500704e9b36689f82162797dda3f1864
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- volk (2.5.1-1+rpi1) bookworm-staging; urgency=medium
++volk (2.5.1-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>  Mon, 21 Feb 2022 11:37:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 14:46:27 +0000
++
+ volk (2.5.1-2) unstable; urgency=medium
+ 
+   * VolkPython use posix prefix scheme (Closes: #1009394)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 12 Apr 2022 18:39:33 -0400
  
  volk (2.5.1-1) unstable; urgency=medium
  

diff --cc debian/control
index eeb724f0ff6849213cdd76ce7998779e5490897a,de5afde04f2913a13667da0f3901e9565f830d65..bde2f316303500a0714a6cafe6d17618ef92b714
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,8 -9,8 +9,8 @@@ Build-Depends: cmake
                 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
+ Standards-Version: 4.6.0
  Rules-Requires-Root: no
  Homepage: https://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk

diff --cc debian/patches/series
index 692cd3a9d3babd46d7c0f244628969fed1710de1,0ef8eccfdbdb35e492e27f65e00a94df2b406134..4e2f095242791812e547f57e517f78e901e04823
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@ make-acc-happ
  optional-static-apps
  skip-cpu_features-on-kfreebsd
  remove-external-HTML-resources
+ volkpython-use-posix-prefix-scheme
 +disable-neon