Merge version 2.1.0-2+rpi1 and 2.2.0-2 to produce 2.2.0-2+rpi1

diff --cc debian/changelog
index 3f1eaf5a21aa06b309b45cdbd9b3f8bcdc2c9e37,e65f3e16841d16dddebe4e9522fe7013ea62a2cd..5599465561b2787fc4688f6893330a7c8e35dea2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,27 @@@
- volk (2.1.0-2+rpi1) bullseye-staging; urgency=medium
++volk (2.2.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.
 +
 +  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
 +  * Add bulid-depends-indep on texlive-latex-extra.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 13 Jan 2020 03:31:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Feb 2020 03:07:45 +0000
++
+ volk (2.2.0-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 18 Feb 2020 17:56:58 -0500
+ 
+ volk (2.2.0-1) experimental; urgency=medium
+ 
+   * New upstream release
+     - Remove build dependency on python six
+     - Fixup VolkConfigVersion
+     - add volk_version.h
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 16 Feb 2020 18:25:20 -0500
  
  volk (2.1.0-2) unstable; urgency=medium
  

diff --cc debian/control
index 085e7b13c14ae3c9263c71f25339630517803ca0,28f6605fd5705d53c0e861c42f2d7c94c8e077fc..d867767358beb213364e0fa7cd9bab1bc42d3138
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -7,9 -7,8 +7,8 @@@ Build-Depends: cmake
                 dh-python,
                 liborc-0.4-dev,
               python3-dev,
-              python3-mako,
-              python3-six
+              python3-mako
 -Build-Depends-Indep: doxygen
 +Build-Depends-Indep: doxygen, texlive-latex-extra,
  Standards-Version: 4.4.0
  Homepage: http://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk

diff --cc lib/CMakeLists.txt
Simple merge