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

diff --cc debian/changelog
index e737ea7851d6cae65e14fb9974a57c2e559ef168,f0e150e2c3eabd0fa53fc47e93a55942ada7e681..c5c73511ac11b76f2597fcb657465ccda27359a0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- volk (1.3-1+rpi1) stretch-staging; urgency=medium
++volk (1.3-2+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>  Sat, 09 Jul 2016 13:42:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Sep 2017 18:58:43 +0000
++
+ volk (1.3-2) unstable; urgency=medium
+ 
+   * update to v1.3-16-g28b03a9
+     apps: fix profile update reading end of lines
+     qa: lower tolerance for 32fc_mag to fix issue #96
+   * include upstream master patch to sort input files
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 27 Aug 2017 13:44:55 -0400
  
  volk (1.3-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 087911d2f721e6d5f5f5433f291b1d330aa61fea,eb9c4630d237fd5994ef266bc87a279ba521fb2d..c1ce6ee81bb2bc1566dcbabf55d0c3b3ba4ca652
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -11,5 +11,6 @@@ native-armv7-build-suppor
  make-acc-happy
  sort-cmake-glob-lists
  install-all-headers
+ sort-input-files.patch
+ libm-link
 +disable-neon

diff --cc lib/CMakeLists.txt
Simple merge