From: Raspbian automatic forward porter Date: Tue, 21 Jan 2020 05:19:11 +0000 (+0000) Subject: Merge version 4.08.1-6+rpi1 and 4.08.1-7 to produce 4.08.1-7+rpi1 X-Git-Tag: raspbian/4.08.1-7+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=54e0bd67d761fe696142e73894cb1497cdcf4adb;p=ocaml.git Merge version 4.08.1-6+rpi1 and 4.08.1-7 to produce 4.08.1-7+rpi1 --- ac8b56537cb30bfb327292706d21695cfed99c75 diff --cc debian/changelog index ecb76238,d4652c89..4af308f9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,12 +1,26 @@@ - ocaml (4.08.1-6+rpi1) bullseye-staging; urgency=medium ++ocaml (4.08.1-7+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green at Tue, 26 Nov 2019 19:38:59 +0000] + * Revert previous raspbian changes, changing the triplet + now seems to cause more problems than it solves (specifically + it causes ocaml to try and use nonexistant compilers). + * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf" + * Partially fix clean target. + + [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green] + * Remove gitattributes that cause problems for dgit. + - -- Raspbian forward porter Sat, 11 Jan 2020 03:28:12 +0000 ++ -- Raspbian forward porter Tue, 21 Jan 2020 05:19:11 +0000 ++ + ocaml (4.08.1-7) unstable; urgency=medium + + [ Stéphane Glondu ] + * Install stdlib-shims compatibility package + + [ Andy Li ] + * Install uchar compatibility package + + -- Stéphane Glondu Tue, 14 Jan 2020 13:36:36 +0100 ocaml (4.08.1-6) unstable; urgency=medium