From: Peter Michael Green Date: Sat, 11 Jul 2020 13:11:05 +0000 (+0000) Subject: Manual merge of version 5.3.2-1+rpi1 and 5.3.3-1 to produce 5.3.3-1+rpi1 X-Git-Tag: archive/raspbian/5.3.3-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f37df9903a205ae2f6f92b63619520acef5220f;p=fplll.git Manual merge of version 5.3.2-1+rpi1 and 5.3.3-1 to produce 5.3.3-1+rpi1 --- 4f37df9903a205ae2f6f92b63619520acef5220f diff --cc debian/changelog index f6858d8,24aaa5c..a6db9d1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,14 +1,21 @@@ - fplll (5.3.2-1+rpi1) bullseye-staging; urgency=medium ++fplll (5.3.3-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 5.3.1-2+rpi1 by Peter Michael Green at Sat, 11 Jan 2020 01:35:53 +0000] + * Use -latomic on armhf too. + - -- Raspbian forward porter Mon, 20 Jan 2020 00:06:14 +0000 ++ -- Peter Michael Green Sat, 11 Jul 2020 12:00:58 +0000 ++ + fplll (5.3.3-1) unstable; urgency=medium + + * New upstream release. + * Update the team mail address. + * Bump std-ver to 4.5.0. + * Drop -Wl,--as-needed from d/rules (it's now the default). + * Ship the static library (Closes: #964062). + * Refresh patches and drop upstreamed ones. + * Add b-dep on pkg-config. + + -- Julien Puydt Sun, 05 Jul 2020 09:51:48 +0200 fplll (5.3.2-1) unstable; urgency=medium diff --cc debian/rules index 077449d,2daa0d6..cca5d9d --- a/debian/rules +++ b/debian/rules @@@ -5,10 -5,8 +5,8 @@@ # for which I thank: # - ARM Ltd for hosting # - Marvell Technology Group Ltd for the hardware -ifneq (,$(findstring $(DEB_HOST_ARCH),armel mipsel m68k powerpc sh4)) +ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf mipsel m68k powerpc sh4)) - export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -latomic - else - export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed + export DEB_LDFLAGS_MAINT_APPEND=-latomic endif export DEB_CPPFLAGS_MAINT_APPEND= -D_LARGEFILE_SOURCE