From: Raspbian forward pporter Date: Fri, 30 Jun 2017 15:24:16 +0000 (+0100) Subject: Merge version 3.0.0+dfsg-11+rpi1 and 3.0.0+dfsg-12 to produce 3.0.0+dfsg-12+rpi1 X-Git-Tag: archive/raspbian/3.0.0+dfsg-12+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=75577818a5b3b7eae704b17166a67e6145651b05;p=fpc.git Merge version 3.0.0+dfsg-11+rpi1 and 3.0.0+dfsg-12 to produce 3.0.0+dfsg-12+rpi1 --- 75577818a5b3b7eae704b17166a67e6145651b05 diff --cc debian/changelog index 46bdf392,144e9de2..51b38f72 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,16 @@@ - fpc (3.0.0+dfsg-11+rpi1) stretch-staging; urgency=medium ++fpc (3.0.0+dfsg-12+rpi1) buster-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 Fri, 24 Feb 2017 21:12:43 +0000 ++ -- Raspbian forward porter Fri, 30 Jun 2017 15:24:16 +0000 ++ + fpc (3.0.0+dfsg-12) unstable; urgency=medium + + * Fix "[fp-units-rtl-3.0.0] Incorrect conversion from local time to + UTC". Backported fix from 3.0.2 (Closes: #864148) + + -- Abou Al Montacir Sat, 10 Jun 2017 19:13:48 +0200 fpc (3.0.0+dfsg-11) unstable; urgency=medium diff --cc debian/patches/series index 20de3625,d138f834..546e08ca --- a/debian/patches/series +++ b/debian/patches/series @@@ -39,4 -39,4 +39,5 @@@ further-arm64-fixes.patc ppdep-fix-else-handling.patch fix-spelling-errors_more.patch armhf-fix-vstr-vld-offset.patch + Correct-for-different-meaning-of-TZOffset.patch +raspbian.diff