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

diff --cc debian/changelog
index c800638dc65ab2371845b5bcf255d688546f2ea6,7c6bae642b35b701d49929ef9b5143b4dc47291e..58574f34a585a002fb34a1e41d17e97ae65e1d67
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- volk (2.4.1-1+rpi1) bullseye-staging; urgency=medium
++volk (2.4.1-2+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>  Wed, 23 Dec 2020 11:52:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jan 2021 14:02:46 +0000
++
+ volk (2.4.1-2) unstable; urgency=medium
+ 
+   [ Shengjing Zhu ]
+   * Use system cpu_features package
+ 
+   [ A. Maitland Bottoms ]
+   * Adopt Use system cpu_features package patch (Closes: #978096)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 27 Dec 2020 15:16:07 -0500
  
  volk (2.4.1-1) unstable; urgency=medium
  

diff --cc debian/control
index 70e94f3fa52f00c0903dffbf360156fc1334fa07,5bfb43a8eca5eb2e07788743ad8d1b43675bf3d8..94c0539edbf60ac4a688b88ccdce0ed40bd5689b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,9 -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],
               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
index cb87e7105745dfa9a89403e589a33f80027dd956,ac0826c6c5eab5c3e2ed18031a85c306331bf781..672ebafe9e117680c21921ce25c58fcce54fd1a4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@ make-acc-happ
  optional-static-apps
  remove-external-HTML-resources
  skip-cpu_features-on-kfreebsd
+ use-system-cpu-features-package.patch
 +disable-neon

diff --cc lib/CMakeLists.txt
Simple merge