From: Raspbian automatic forward porter Date: Tue, 20 Aug 2024 23:46:51 +0000 (+0100) Subject: Manual merge of version 4.14.1-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 X-Git-Tag: archive/raspbian/5.2.0-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70647364d953ecd897e7f2a9052fae0d14bc1681;p=ocaml.git Manual merge of version 4.14.1-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 --- 70647364d953ecd897e7f2a9052fae0d14bc1681 diff --cc .gitattributes index 132ece9b,0693c28c..87bbecc0 --- a/.gitattributes +++ b/.gitattributes @@@ -154,42 -154,53 +154,52 @@@ tools/magic typo. *.check-program-output text eol=lf *.run text eol=lf -/tools/ci/appveyor/appveyor_build.cmd text eol=crlf - aclocal.m4 typo.tab + Makefile* linguist-language=Makefile + *.c linguist-language=C + *.h linguist-language=C + *.h.in linguist-language=C + *.hva linguist-language=TeX + *.ml linguist-language=OCaml + *.ml? linguist-language=OCaml + *.mld linguist-documentation + *.ml*.in linguist-language=OCaml + *.tbl linguist-language=C + + aclocal.m4 typo.tab -linguist-vendored linguist-language=M4Sugar configure.ac text eol=lf - build-aux/compile text eol=lf - build-aux/config.guess text eol=lf - build-aux/config.sub text eol=lf - build-aux/install text eol=lf - build-aux/missing text eol=lf - ocamldoc/remove_DEBUG text eol=lf - ocamltest/getocamloptdefaultflags text eol=lf - ocamltest/ocamltest.org typo.long-line=may typo.missing-header + # These scripts are all parts of autoconf and are tagged linguist-generated + # to suppress inclusion in PR diffs. + build-aux/compile linguist-generated text eol=lf + build-aux/config.guess linguist-generated text eol=lf + build-aux/config.sub linguist-generated text eol=lf + build-aux/install-sh linguist-generated text eol=lf + build-aux/ltmain.sh linguist-generated text eol=lf + build-aux/missing linguist-generated text eol=lf + build-aux/*.m4 linguist-vendored + build-aux/ocaml_version.m4 -linguist-vendored linguist-language=M4Sugar + ocamltest/OCAMLTEST.org typo.long-line=may typo.missing-header stdlib/Compflags text eol=lf - stdlib/sharpbang text eol=lf + stdlib/hashbang -text tools/autogen text eol=lf - tools/ci/inria/remove-sinh-primitive.patch text eol=lf + tools/bump-magic-numbers eol=lf typo.long-line + tools/ci/inria/bootstrap/remove-sinh-primitive.patch -text + tools/ci/inria/bootstrap/script text eol=lf + tools/ci/inria/dune-build/script text eol=lf + tools/ci/inria/launch text eol=lf + tools/ci/inria/light text eol=lf + tools/ci/inria/main text eol=lf + tools/ci/inria/other-configs/script text eol=lf + tools/ci/inria/sanitizers/script text eol=lf + tools/ci/inria/step-by-step-build/script text eol=lf tools/check-typo text eol=lf tools/check-symbol-names text eol=lf - tools/ci-build text eol=lf tools/msvs-promote-path text eol=lf - tools/gdb-macros text eol=lf + tools/gdb-macros text eol=lf linguist-language=GDB tools/magic text eol=lf - tools/make-opcodes text eol=lf - tools/make-package-macosx text eol=lf - tools/ocaml-objcopy-macosx text eol=lf tools/ocamlsize text eol=lf tools/pre-commit-githook text eol=lf - tools/markdown-add-pr-links.sh text eol=lf - runtime/caml/compatibility.h typo.long-line=may - - # These are all Perl scripts, so may not actually require this - manual/tools/caml-tex text eol=lf - manual/tools/format-intf text eol=lf - manual/tools/htmlcut text eol=lf - manual/tools/htmltbl text eol=lf - manual/tools/htmlthread text eol=lf - manual/tools/texexpand text eol=lf + runtime/caml/sizeclasses.h typo.missing-header # Tests which include references spanning multiple lines fail with \r\n # endings, so use \n endings only, even on Windows. diff --cc configure.ac index 642ab9b1,a8e42222..36d454f6 --- a/configure.ac +++ b/configure.ac @@@ -1100,19 -1371,19 +1371,19 @@@ AS_CASE([$host] [earmv7*-*-netbsd*], [arch=arm; model=armv7; system=netbsd], [armv5te*-*-linux-*eabi], - [arch=arm; model=armv5te; system=linux_eabi], + [arch=arm; model=armv5te; system=linux], [armv5*-*-linux-*eabi], - [arch=arm; model=armv5; system=linux_eabi], + [arch=arm; model=armv5; system=linux], [arm*-*-linux-*eabihf], - [arch=arm; model=armv6; system=linux_eabihf], - [arch=arm; system=linux], ++ [arch=arm; model=armv6; system=linux], [arm*-*-linux-*eabi], - [arch=arm; system=linux_eabi], + [arch=arm; system=linux], [arm*-*-openbsd*], - [arch=arm; system=bsd], + [arch=arm; system=openbsd], [zaurus*-*-openbsd*], - [arch=arm; system=bsd], + [arch=arm; system=openbsd], [x86_64-*-linux*], - [arch=amd64; system=linux], + [has_native_backend=yes; arch=amd64; system=linux], [x86_64-*-gnu*], [arch=amd64; system=gnu], [x86_64-*-dragonfly*], diff --cc debian/changelog index 139ecaae,80780147..e9a8ba7b --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,49 +1,63 @@@ - ocaml (4.14.1-1+rpi1) trixie-staging; urgency=medium ++ocaml (5.2.0-2+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 Thu, 28 Sep 2023 16:36:56 +0000 ++ -- Peter Micheal Greem Thu, 05 Sep 2024 02:43:22 +0000 ++ + ocaml (5.2.0-2) unstable; urgency=medium + + * Add ocaml-base to Build-Conflicts + + -- Stéphane Glondu Fri, 09 Aug 2024 06:55:14 +0200 + + ocaml (5.2.0-1) unstable; urgency=medium + + * Upload to unstable (Closes: #1073289) + * Add bytes and bigarray compatibility packages + * Change OCaml stdlib dir to /usr/lib//ocaml/ + + -- Stéphane Glondu Wed, 07 Aug 2024 14:12:25 +0200 + + ocaml (5.2.0-1~exp4) experimental; urgency=medium + + * Bump version of findlib in Breaks/Replaces (Closes: #1074589) + + -- Stéphane Glondu Tue, 02 Jul 2024 04:58:56 +0200 + + ocaml (5.2.0-1~exp3) experimental; urgency=medium + + * Add Breaks/Replaces for lib{stdlib,compiler-libs}-ocaml-dev as well + (Closes: #1073995) + * Re-enable runtime_events on armel and mmap runtime event state in + RW mode there + + -- Stéphane Glondu Mon, 01 Jul 2024 14:37:18 +0200 + + ocaml (5.2.0-1~exp2) experimental; urgency=medium + + * Remove ppc64 from native architectures + * ocaml Depends on libzstd-dev + * libstdlib-ocaml Breaks/Replaces libfindlib-ocaml (because of META + files) (Closes: #1073243) + * Do no longer call "make bootstrap" + * Fix FTBFS on m68k + * Make runtime_events optional and disable it on armel (fixes FTBFS) + + -- Stéphane Glondu Thu, 20 Jun 2024 04:31:52 +0200 + + ocaml (5.2.0-1~exp1) experimental; urgency=medium + + * New upstream release (Closes: #1073289) + + -- Stéphane Glondu Thu, 13 Jun 2024 08:38:39 +0200 ocaml (4.14.1-1) unstable; urgency=medium diff --cc debian/patches/remove-gitattributes-that-cause-problems.patch index bb544d2c,00000000..100dffe3 mode 100644,000000..100644 --- a/debian/patches/remove-gitattributes-that-cause-problems.patch +++ b/debian/patches/remove-gitattributes-that-cause-problems.patch @@@ -1,15 -1,0 +1,15 @@@ +From: Peter Michael Green +Subject: Remove gitattributes that cause problems for dgit. + +diff --git a/.gitattributes b/.gitattributes - index 956d2136..a278ffe0 100644 ++index 0693c28c..87bbecc0 100644 +--- a/.gitattributes ++++ b/.gitattributes - @@ -151,7 +151,6 @@ menhir-bench.bash typo.missing-header typo.utf8 ++@@ -154,7 +154,6 @@ tools/magic typo.missing-header + *.check-program-output text eol=lf + *.run text eol=lf + +-/tools/ci/appveyor/appveyor_build.cmd text eol=crlf + - aclocal.m4 typo.tab - configure.ac text eol=lf ++ Makefile* linguist-language=Makefile ++ *.c linguist-language=C diff --cc debian/patches/series index 8ca7c1e3,441a118f..7540aa72 --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,5 -5,6 +5,8 @@@ 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 + 0008-Fix-call-to-test-in-configure.ac.patch + 0009-Rework-fixed-register-assignments-on-m68k.patch + 0010-Avoid-atomic-64-bit-load-on-Debian-armel.patch +use-armv6-for-raspbian.patch +remove-gitattributes-that-cause-problems.patch diff --cc debian/patches/use-armv6-for-raspbian.patch index 8e3cc61f,00000000..fea96a78 mode 100644,000000..100644 --- a/debian/patches/use-armv6-for-raspbian.patch +++ b/debian/patches/use-armv6-for-raspbian.patch @@@ -1,16 -1,0 +1,16 @@@ +Description: Edit configure.ac to select armv6 when using "arm-linux-gnueabihf" +Author: Peter Michael Green + +diff --git a/configure.ac b/configure.ac - index 9ac019f7..03f0fd95 100644 ++index a8e42222..36d454f6 100644 +--- a/configure.ac ++++ b/configure.ac - @@ -1092,7 +1092,7 @@ AS_CASE([$host], ++@@ -1375,7 +1375,7 @@ AS_CASE([$host], + [armv5*-*-linux-*eabi], - [arch=arm; model=armv5; system=linux_eabi], ++ [arch=arm; model=armv5; system=linux], + [arm*-*-linux-*eabihf], - - [arch=arm; system=linux_eabihf], - + [arch=arm; model=armv6; system=linux_eabihf], ++- [arch=arm; system=linux], +++ [arch=arm; model=armv6; system=linux], + [arm*-*-linux-*eabi], - [arch=arm; system=linux_eabi], ++ [arch=arm; system=linux], + [arm*-*-openbsd*],