From: Raspbian automatic forward porter Date: Sat, 21 Jun 2025 00:00:16 +0000 (+0100) Subject: Merge version 5.3.0-2+rpi1 and 5.3.0-3 to produce 5.3.0-3+rpi1 X-Git-Tag: archive/raspbian/5.3.0-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e6fd862b445e16a6af702a370cc3306ff405cb6f;p=ocaml.git Merge version 5.3.0-2+rpi1 and 5.3.0-3 to produce 5.3.0-3+rpi1 --- e6fd862b445e16a6af702a370cc3306ff405cb6f diff --cc debian/changelog index b36e2506,4ac91913..6a777e89 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,9 +1,23 @@@ - ocaml (5.3.0-2+rpi1) trixie-staging; urgency=medium ++ocaml (5.3.0-3+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 Mon, 10 Feb 2025 01:24:41 +0000 ++ -- Raspbian forward porter Sat, 21 Jun 2025 00:00:16 +0000 ++ + ocaml (5.3.0-3) unstable; urgency=medium + + * Mark tests that actually require multicore (Closes: #1101353) + * Do not run flaky test (Closes: #1103008) + + -- Stéphane Glondu Thu, 12 Jun 2025 14:08:28 +0200 ocaml (5.3.0-2) unstable; urgency=medium diff --cc debian/patches/series index 58efb0b7,fa84b141..1ed950ef --- a/debian/patches/series +++ b/debian/patches/series @@@ -5,5 -5,4 +5,6 @@@ 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch 0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch 0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch + 0008-Mark-tests-that-actually-require-multicore.patch +use-armv6-for-raspbian.patch +remove-gitattributes-that-cause-problems.patch