From: Raspbian automatic forward porter Date: Thu, 16 Jun 2022 10:15:28 +0000 (+0100) Subject: Merge version 2.4-1+rpi1 and 2.4-2 to produce 2.4-2+rpi1 X-Git-Tag: raspbian/2.4-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ce808e15f54b59ff6ad3daeb5adab95a205eaf5;p=ffcall.git Merge version 2.4-1+rpi1 and 2.4-2 to produce 2.4-2+rpi1 --- 44458331f3dbea202a60e82ffd8c6045824123da diff --cc debian/changelog index d3c4563,86f6bbf..67586e9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,13 +1,21 @@@ - ffcall (2.4-1+rpi1) bookworm-staging; urgency=medium ++ffcall (2.4-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.0-2+rpi1 by Peter Michael Green at Thu, 07 Dec 2017 01:23:49 +0000] + * Mark binaries as vpfv2 not vfpv3_d16 + * Disable testsuite, it fails on some of our buildboxes. + - -- Raspbian forward porter Thu, 02 Sep 2021 16:56:37 +0000 ++ -- Raspbian forward porter Thu, 16 Jun 2022 10:15:27 +0000 ++ + ffcall (2.4-2) unstable; urgency=medium + + * d/copyright: fix short license name (FSFULLR instead of FSFUL) + * m4-dirs.patch: new patch, to tell Autoconf where to look for local macros. + As a consequence, no longer pass these directories as arguments to aclocal + in debian/rules. Libtool macros are thus properly updated by dh-autoreconf. + (Closes: #1011808) + * Bump S-V to 4.6.1 + + -- Sébastien Villemot Wed, 08 Jun 2022 10:34:29 +0200 ffcall (2.4-1) unstable; urgency=medium diff --cc debian/patches/series index c54595a,384f135..3e57fad --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,1 +1,2 @@@ + m4-dirs.patch +raspbian.patch diff --cc debian/rules index 3407719,c685506..f17ae57 --- a/debian/rules +++ b/debian/rules @@@ -2,10 -2,5 +2,8 @@@ include /usr/share/dpkg/default.mk - export ACLOCAL = aclocal -I$(CURDIR)/m4 -I$(CURDIR)/gnulib-m4 - %: dh $@ --no-parallel + +override_dh_auto_test: + echo testsuite disabled.