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

diff --cc debian/changelog
index e36ea6bea38fe89a984bb4e57d03dd415163b690,4c2e9d8df4c7bba7cc39071d77e9812d636c14cd..e2b472fe411726a8bc44f8aa1a59ba609eebcdb8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,18 @@@
- volk (2.5.0-2+rpi1) bookworm-staging; urgency=medium
++volk (2.5.1-1+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>  Thu, 28 Oct 2021 17:19:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 21 Feb 2022 11:37:54 +0000
++
+ volk (2.5.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 13 Feb 2022 00:18:58 -0500
  
  volk (2.5.0-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 68af4fa77f3c2b84556c6114b2b08deaf687377a,ebe1f7c5ff1d9de5210c10027cbfb514ccb79752..692cd3a9d3babd46d7c0f244628969fed1710de1
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,4 +1,5 @@@
- 0001-Add-volk_32f-c-_index_min_16-32u.patch
- 0002-Fix-volk_32fc_index_min_32u_neon.patch
- 0003-Fix-volk_32fc_index_min_32u_neon.patch
- 0004-Code-cleanup.patch
- 0005-Fix-clang-format-errors.patch
- 0006-New-generic-implementation-fixed-typos.patch
- 0007-Add-the-list-of-contributors-agreeing-to-LGPL-licens.patch
- 0009-Code-cleanup.patch
- 0010-Fix-clang-format-errors.patch
- 0011-Code-cleanup.patch
- 0012-Fix-clang-format-errors.patch
- 0055-asan-Fix-volk_malloc-alignment-bug.patch
- 0056-format-Fix-code-format.patch
  make-acc-happy
  optional-static-apps
- remove-external-HTML-resources
  skip-cpu_features-on-kfreebsd
- use-system-cpu-features-package.patch
+ remove-external-HTML-resources
 +disable-neon

diff --cc lib/CMakeLists.txt
Simple merge