Merge version 2.4.0-3+rpi1 and 2.4.1-1 to produce 2.4.1-1+rpi1

diff --cc debian/changelog
index 8453a0143d80c505b0720b9e006ac14f401e0deb,4c2f71e8d13bcf7aef5488c4173c35a456576442..c800638dc65ab2371845b5bcf255d688546f2ea6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- volk (2.4.0-3+rpi1) bullseye-staging; urgency=medium
++volk (2.4.1-1+rpi1) bullseye-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, 13 Dec 2020 08:13:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 11:52:27 +0000
++
+ volk (2.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 17 Dec 2020 23:53:21 -0500
+ 
+ volk (2.4.0-4) unstable; urgency=medium
+ 
+   * skip cpu_features on "Unsupported OS" kFreeBSD
+   * bump Standards-Version - no other changes.
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 15 Dec 2020 19:53:16 -0500
  
  volk (2.4.0-3) unstable; urgency=medium
  

diff --cc debian/control
index 2f409fbe54aa4d8fcf01183011fffc37ab85787a,42c6ab462fe0d4602cd79290e733dcb3f6c2ae59..70e94f3fa52f00c0903dffbf360156fc1334fa07
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,8 -8,8 +8,8 @@@ Build-Depends: cmake
                 liborc-0.4-dev,
               python3-dev,
               python3-mako
 -Build-Depends-Indep: doxygen, graphviz
 +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
- Standards-Version: 4.5.0
+ Standards-Version: 4.5.1
  Rules-Requires-Root: no
  Homepage: https://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk

diff --cc debian/patches/series
index ae38269d03321ee37d15a2cbc21436d6868380ac,065084978526406f35c8955fb2fd84b2201bedbc..cb87e7105745dfa9a89403e589a33f80027dd956
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,4 +1,5 @@@
  make-acc-happy
  optional-static-apps
  remove-external-HTML-resources
- cpu_features-CMake-option
+ skip-cpu_features-on-kfreebsd
 +disable-neon

diff --cc lib/CMakeLists.txt
Simple merge