From: Raspbian automatic forward porter Date: Wed, 5 Feb 2020 08:59:42 +0000 (+0000) Subject: Merge version 4.08.1-7+rpi1 and 4.08.1-8 to produce 4.08.1-8+rpi1 X-Git-Tag: archive/raspbian/4.08.1-8+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7c5c4e0b31045ba89e774544efa4e967c8f5f51;p=ocaml.git Merge version 4.08.1-7+rpi1 and 4.08.1-8 to produce 4.08.1-8+rpi1 --- b7c5c4e0b31045ba89e774544efa4e967c8f5f51 diff --cc debian/changelog index 4af308f9,3480e841..aae7abfe --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,8 +1,22 @@@ - ocaml (4.08.1-7+rpi1) bullseye-staging; urgency=medium ++ocaml (4.08.1-8+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 Tue, 21 Jan 2020 05:19:11 +0000 ++ -- Raspbian forward porter Wed, 05 Feb 2020 08:59:41 +0000 ++ + ocaml (4.08.1-8) unstable; urgency=medium + + * read_main_debug_info: do not die in -custom executables + + -- Stéphane Glondu Thu, 30 Jan 2020 13:11:32 +0100 ocaml (4.08.1-7) unstable; urgency=medium diff --cc debian/patches/series index 0a31f9de,091e2f65..be2e2de7 --- a/debian/patches/series +++ b/debian/patches/series @@@ -3,5 -3,4 +3,6 @@@ 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch 0008-Reimplement-custom-without-hacks.patch + 0006-read_main_debug_info-do-not-die-in-custom-executable.patch +use-armv6-for-raspbian.patch +remove-gitattributes-that-cause-problems.patch