From: Peter Michael Green Date: Sun, 7 Feb 2021 23:03:39 +0000 (+0000) Subject: Manual merge of version 3.2.0+dfsg-11+rpi1 and 3.2.0+dfsg-12 to produce 3.2.0+dfsg... X-Git-Tag: archive/raspbian/3.2.0+dfsg-12+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce7b24635f1625ddf9c5536d32ea601b519e67a1;p=fpc.git Manual merge of version 3.2.0+dfsg-11+rpi1 and 3.2.0+dfsg-12 to produce 3.2.0+dfsg-12+rpi1 --- ce7b24635f1625ddf9c5536d32ea601b519e67a1 diff --cc debian/changelog index d80e5949,30dd30c1..d76d82fe --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,13 +1,20 @@@ - fpc (3.2.0+dfsg-11+rpi1) bullseye-staging; urgency=medium ++fpc (3.2.0+dfsg-12+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green at Mon, 20 Oct 2014 23:12:17 +0000] + * Set compiler defaults for raspbian. + - -- Raspbian forward porter Thu, 14 Jan 2021 20:35:41 +0000 ++ -- Raspbian forward porter Fri, 05 Feb 2021 05:46:18 +0000 ++ + fpc (3.2.0+dfsg-12) unstable; urgency=medium + + [ Graham Inggs ] + * Drop unnecessary build dependency on binutils + + [ Abou Al Montacir ] + * Disable FPU inlining on m68k. + Thanks to John Paul Adrian Glaubitz (Closes: Bug#980841) + + -- Abou Al Montacir Mon, 25 Jan 2021 22:36:28 +0100 fpc (3.2.0+dfsg-11) bullseye; urgency=medium diff --cc debian/patches/series index f26436c5,c6fc234c..832e9d54 --- a/debian/patches/series +++ b/debian/patches/series @@@ -20,7 -20,6 +20,7 @@@ fix_make_files_generation.patc #fix-IDE-GDB-support.patch clean_man_pages.patch ncurses6.patch - fix-FTBFS-on-m68k.patch + m68k-disable-FPU-inlining.patch Fix-liking-with-libc-when-PIC-is-enabled.patch fix-utest-version-lists.patch +raspbian.diff