From: Raspbian automatic forward porter Date: Mon, 18 Apr 2022 14:46:28 +0000 (+0100) Subject: Merge version 2.5.1-1+rpi1 and 2.5.1-2 to produce 2.5.1-2+rpi1 X-Git-Tag: archive/raspbian/2.5.1-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=024a0d981e8043ae57deb86eec0f9884aaad4cf5;p=volk.git Merge version 2.5.1-1+rpi1 and 2.5.1-2 to produce 2.5.1-2+rpi1 --- b362a153ebde2b76b3f38ac1745299987ae6527e diff --cc debian/changelog index e2b472f,a8abae5..f911d00 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,8 +1,18 @@@ - volk (2.5.1-1+rpi1) bookworm-staging; urgency=medium ++volk (2.5.1-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.1-1+rpi1 by Peter Michael Green 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 Mon, 21 Feb 2022 11:37:54 +0000 ++ -- Raspbian forward porter Mon, 18 Apr 2022 14:46:27 +0000 ++ + volk (2.5.1-2) unstable; urgency=medium + + * VolkPython use posix prefix scheme (Closes: #1009394) + + -- A. Maitland Bottoms Tue, 12 Apr 2022 18:39:33 -0400 volk (2.5.1-1) unstable; urgency=medium diff --cc debian/control index eeb724f,de5afde..bde2f31 --- a/debian/control +++ b/debian/control @@@ -9,8 -9,8 +9,8 @@@ Build-Depends: cmake libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el x32], python3-dev, python3-mako -Build-Depends-Indep: doxygen, graphviz +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra, - Standards-Version: 4.5.1 + Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://libvolk.org Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk diff --cc debian/patches/series index 692cd3a,0ef8ecc..4e2f095 --- a/debian/patches/series +++ b/debian/patches/series @@@ -2,4 -2,4 +2,5 @@@ make-acc-happ optional-static-apps skip-cpu_features-on-kfreebsd remove-external-HTML-resources + volkpython-use-posix-prefix-scheme +disable-neon