From: Raspbian automatic forward porter Date: Sat, 7 Dec 2019 05:03:47 +0000 (+0000) Subject: Merge version 4.08.1-4+rpi2 and 4.08.1-5 to produce 4.08.1-5+rpi1 X-Git-Tag: archive/raspbian/4.08.1-5+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61f06a5f206ea12907bc94106475f3b7cc256245;p=ocaml.git Merge version 4.08.1-4+rpi2 and 4.08.1-5 to produce 4.08.1-5+rpi1 --- 61f06a5f206ea12907bc94106475f3b7cc256245 diff --cc debian/changelog index 795f26b5,178db7e3..bc1c8ff4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,20 @@@ - ocaml (4.08.1-4+rpi2) bullseye-staging; urgency=medium ++ocaml (4.08.1-5+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. + - -- Peter Michael Green Tue, 26 Nov 2019 19:38:59 +0000 ++ -- Raspbian forward porter Sat, 07 Dec 2019 05:03:46 +0000 ++ + ocaml (4.08.1-5) unstable; urgency=medium + + * ocaml-nox: add Breaks+Replaces ocaml-compiler-libs (Closes: #945495) + * Bump Standards-Version to 4.4.1 + + -- Stéphane Glondu Mon, 02 Dec 2019 13:04:37 +0100 ocaml (4.08.1-4) unstable; urgency=medium