From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 23 Dec 2020 11:52:28 +0000 (+0000)
Subject: Merge version 2.4.0-3+rpi1 and 2.4.1-1 to produce 2.4.1-1+rpi1
X-Git-Tag: archive/raspbian/2.4.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61fd8c9b574a880cd9598555a2bacb5636100f38;p=volk.git

Merge version 2.4.0-3+rpi1 and 2.4.1-1 to produce 2.4.1-1+rpi1
---

61fd8c9b574a880cd9598555a2bacb5636100f38
diff --cc debian/changelog
index 8453a01,4c2f71e..c800638
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- volk (2.4.0-3+rpi1) bullseye-staging; urgency=medium
++volk (2.4.1-1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Dec 2020 08:13:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 11:52:27 +0000
++
+ volk (2.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 17 Dec 2020 23:53:21 -0500
+ 
+ volk (2.4.0-4) unstable; urgency=medium
+ 
+   * skip cpu_features on "Unsupported OS" kFreeBSD
+   * bump Standards-Version - no other changes.
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 15 Dec 2020 19:53:16 -0500
  
  volk (2.4.0-3) unstable; urgency=medium
  
diff --cc debian/control
index 2f409fb,42c6ab4..70e94f3
--- a/debian/control
+++ b/debian/control
@@@ -8,8 -8,8 +8,8 @@@ Build-Depends: cmake
                 liborc-0.4-dev,
  	       python3-dev,
  	       python3-mako
 -Build-Depends-Indep: doxygen, graphviz
 +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
- Standards-Version: 4.5.0
+ Standards-Version: 4.5.1
  Rules-Requires-Root: no
  Homepage: https://libvolk.org
  Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk
diff --cc debian/patches/series
index ae38269,0650849..cb87e71
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,4 +1,5 @@@
  make-acc-happy
  optional-static-apps
  remove-external-HTML-resources
- cpu_features-CMake-option
+ skip-cpu_features-on-kfreebsd
 +disable-neon