From: Raspbian automatic forward porter Date: Tue, 28 Feb 2023 01:33:27 +0000 (+0000) Subject: Merge version 4.13.1-3+rpi1 and 4.13.1-4 to produce 4.13.1-4+rpi1 X-Git-Tag: archive/raspbian/4.13.1-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0b417e1d38b672ab6cbec14da17dacbe8987539a;p=ocaml.git Merge version 4.13.1-3+rpi1 and 4.13.1-4 to produce 4.13.1-4+rpi1 --- 0b417e1d38b672ab6cbec14da17dacbe8987539a diff --cc debian/changelog index 2d12083d,6c07d89b..b56ab77f --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,8 +1,22 @@@ - ocaml (4.13.1-3+rpi1) bookworm-staging; urgency=medium ++ocaml (4.13.1-4+rpi1) bookworm-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. + - -- Peter Michael Green Thu, 03 Feb 2022 18:25:38 +0000 ++ -- Raspbian forward porter Tue, 28 Feb 2023 01:33:26 +0000 ++ + ocaml (4.13.1-4) unstable; urgency=medium + + * Avoid build path ending up in binaries (Closes: #1030785) + + -- Stéphane Glondu Sun, 12 Feb 2023 11:46:40 +0100 ocaml (4.13.1-3) unstable; urgency=medium diff --cc debian/patches/series index 9c41ac12,56079e3b..8ca7c1e3 --- a/debian/patches/series +++ b/debian/patches/series @@@ -5,5 -5,4 +5,6 @@@ 0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch 0006-Do-not-error-on-warnings-in-autoconf.patch 0007-Put-manpages-in-section-3o-instead-of-3.patch + 0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch +use-armv6-for-raspbian.patch +remove-gitattributes-that-cause-problems.patch