Manual merge of version 1.4-3+rpi1 and 2.0.0-2 to produce 2.0.0-2+rpi1

diff --cc debian/changelog
index 3cd227385097feef347d28a014888c7ec6b163a8,13adf7f4599b59a0adbaa6501cc32f4252a8f8f9..13fe6490d9630c331cd23345d44d84bcc41f2710
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- volk (1.4-3+rpi1) buster-staging; urgency=medium
++volk (2.0.0-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 20 May 2018 21:04:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 22 Aug 2019 17:08:21 +0000
++
+ volk (2.0.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Mon, 12 Aug 2019 22:49:11 -0400
+ 
+ volk (2.0.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Wed, 07 Aug 2019 23:31:20 -0400
+ 
+ volk (1.4-4) unstable; urgency=medium
+ 
+   * working volk_modtool with Python 3
+   * build and install libvolk.a
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Mon, 29 Oct 2018 01:32:05 -0400
  
  volk (1.4-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8dce5a99131892632c9611dcfe90c956796c893b,d53bd84fc33eda8a0adc22bd9c400e4cffa05156..046dd34bc50993bbbaa7b7f6a573df8076757a4b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,3 +1,4 @@@
- 0002-Added-an-AVX-protokernel-for-volk_32fc_x2_32f_square.patch
- 0003-extracted-variables-for-the-source-real-and-imaginar.patch
- 0004-fixed-a-buffer-over-read-and-over-write-in-volk_32fc.patch
- 0005-cmake-Fix-endif-to-match-if.patch
- 0006-Add-sys-time.h-header-copied-from-gnuradio-to-fix-Wi.patch
- 0007-Fix-compile-on-Windows-by-avoiding-min-max-macros-in.patch
- 0008-Fix-add_test-for-Windows.patch
- 0009-Fix-32u_reverse_32u-for-ARM.patch
  native-armv7-build-support
  make-acc-happy
- sort-cmake-glob-lists
- libm-link
+ optional-static-apps
 +disable-neon

diff --cc lib/CMakeLists.txt
index fd0ce707e1af2258ee217231411b78524cafd0db,cf66da07132d452018680e1f512145ef5b28e165..1911a4685021bafa0b029c935ae3954847f821db
--- 1/lib/CMakeLists.txt
--- 2/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@@ -424,7 -457,7 +457,7 @@@ if((${CMAKE_VERSION} VERSION_GREATER "2
    # set up the assembler flags and include the source files
    foreach(ARCH ${ASM_ARCHS_AVAILABLE})
        string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}")
-     if(( ASM_ARCH STREQUAL "neonxxxx" ) OR ( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7xxxx"))
 -    if( ASM_ARCH STREQUAL "neonv7" )
++    if( ASM_ARCH STREQUAL "neonv7xxxxx" )
        message(STATUS "---- Adding ASM files") # we always use ATT syntax
        message(STATUS "-- Detected neon architecture; enabling ASM")
        # setup architecture specific assembler flags