Merge version 1.3-2+rpi1 and 1.3-3 to produce 1.3-3+rpi1

diff --cc debian/changelog
index c5c73511ac11b76f2597fcb657465ccda27359a0,7bd8a0ac8b28daa7428730e25c2620d7e4e9a6c2..b1ef0a860997d45b16f0dcf19e3f09e0cb12ee77
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- volk (1.3-2+rpi1) buster-staging; urgency=medium
++volk (1.3-3+rpi1) buster-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>  Mon, 04 Sep 2017 18:58:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Feb 2018 11:17:38 +0000
++
+ volk (1.3-3) unstable; urgency=medium
+ 
+   * update to v1.3-23-g0109b2e
+   * update debian/libvolk1-dev.abi.tar.gz.amd64
+   * Add breaks/replaces gnuradio (<=3.7.2.1) (LP: #1614235)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 04 Feb 2018 13:12:21 -0500
  
  volk (1.3-2) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc lib/CMakeLists.txt
Simple merge