From: Raspbian automatic forward porter Date: Thu, 28 Sep 2023 16:36:57 +0000 (+0100) Subject: Merge version 4.13.1-6+rpi1 and 4.14.1-1 to produce 4.14.1-1+rpi1 X-Git-Tag: archive/raspbian/4.14.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea6279b1490a55b7ca6c7c9437262828f4de058c;p=ocaml.git Merge version 4.13.1-6+rpi1 and 4.14.1-1 to produce 4.14.1-1+rpi1 --- ea6279b1490a55b7ca6c7c9437262828f4de058c diff --cc debian/changelog index ab752a55,3534794f..139ecaae --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,8 +1,22 @@@ - ocaml (4.13.1-6+rpi1) trixie-staging; urgency=medium ++ocaml (4.14.1-1+rpi1) trixie-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 Wed, 20 Sep 2023 15:06:07 +0000 ++ -- Raspbian forward porter Thu, 28 Sep 2023 16:36:56 +0000 ++ + ocaml (4.14.1-1) unstable; urgency=medium + + * New upstream release + + -- Stéphane Glondu Wed, 20 Sep 2023 09:59:40 +0200 ocaml (4.13.1-6) unstable; urgency=medium