Merge version 2.3.0-3+rpi1 and 2.4.0-3 to produce 2.4.0-3+rpi1

diff --cc debian/changelog
index 992055e8199a99e63f12bcad81edd0223e204d2e,45f18a6b4be0558edee56694fa2351a991156ebb..8453a0143d80c505b0720b9e006ac14f401e0deb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,33 @@@
- volk (2.3.0-3+rpi1) bullseye-staging; urgency=medium
++volk (2.4.0-3+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>  Mon, 06 Jul 2020 14:22:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Dec 2020 08:13:14 +0000
++
+ volk (2.4.0-3) unstable; urgency=medium
+ 
+   * Fix binary-indep build (Closes: #976300)
+   * Upload to unstable
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 03 Dec 2020 20:43:29 -0500
+ 
+ volk (2.4.0-2) experimental; urgency=medium
+ 
+   * Make use of cpu_features a CMake option with sensible defaults per arch
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Mon, 30 Nov 2020 16:19:19 -0500
+ 
+ volk (2.4.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * cpu_features git submodule packaged as cpu-features source component.
+   * Upload to experimental for soversion bump
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 22 Nov 2020 12:35:43 -0500
  
  volk (2.3.0-3) unstable; urgency=medium
  

diff --cc debian/control
index 4125f1dbd75fd3d64ade3a342d6e70fe0d3b5e1b,b045f04af2f3f24fe36bdf10dac0f4a17921b01a..2f409fbe54aa4d8fcf01183011fffc37ab85787a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,9 -8,10 +8,10 @@@ Build-Depends: cmake
                 liborc-0.4-dev,
               python3-dev,
               python3-mako
- Build-Depends-Indep: doxygen, texlive-latex-extra,
 -Build-Depends-Indep: doxygen, graphviz
++Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
  Standards-Version: 4.5.0
- Homepage: http://libvolk.org
+ Rules-Requires-Root: no
+ Homepage: https://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk
  Vcs-Git: https://salsa.debian.org/bottoms/pkg-volk.git
  

diff --cc debian/patches/series
index 8de0d82dbc8587cf474736b25404c9c66fe5693e,f84bed1ae49496d63f6000db19ff86230deceaa6..ae38269d03321ee37d15a2cbc21436d6868380ac
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,4 +1,5 @@@
  make-acc-happy
  optional-static-apps
  remove-external-HTML-resources
- disable-neon
+ cpu_features-CMake-option
++disable-neon

diff --cc lib/CMakeLists.txt
Simple merge