From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 4 Apr 2018 01:40:23 +0000 (+0100)
Subject: Merge version 1.3-3+rpi1 and 1.3.1-1 to produce 1.3.1-1+rpi1
X-Git-Tag: archive/raspbian/1.3.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=02e239aa6b7b8e032e8dce4eac9b0c74f92b9d4a;p=volk.git

Merge version 1.3-3+rpi1 and 1.3.1-1 to produce 1.3.1-1+rpi1
---

02e239aa6b7b8e032e8dce4eac9b0c74f92b9d4a
diff --cc debian/changelog
index b1ef0a8,ef2f84b..8a0da57
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- volk (1.3-3+rpi1) buster-staging; urgency=medium
++volk (1.3.1-1+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, 10 Feb 2018 11:17:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 04 Apr 2018 01:40:23 +0000
++
+ volk (1.3.1-1) unstable; urgency=medium
+ 
+   * New upstream bugfix release
+   * Refresh all debian patches for use with git am
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 27 Mar 2018 21:54:29 -0400
  
  volk (1.3-3) unstable; urgency=medium
  
diff --cc debian/patches/series
index 841b625,94f71f2..b1b0dff
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -18,6 -2,5 +2,6 @@@ native-armv7-build-suppor
  make-acc-happy
  sort-cmake-glob-lists
  install-all-headers
- sort-input-files.patch
+ sort-input-files
  libm-link
 +disable-neon