Manual merge of version 4.14.1-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1 archive/raspbian/5.2.0-2+rpi1 raspbian/5.2.0-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Tue, 20 Aug 2024 23:46:51 +0000 (00:46 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 5 Sep 2024 03:00:13 +0000 (03:00 +0000)
1  2 
.gitattributes
configure.ac
debian/changelog
debian/patches/remove-gitattributes-that-cause-problems.patch
debian/patches/series
debian/patches/use-armv6-for-raspbian.patch
debian/rules

diff --cc .gitattributes
index 132ece9b35a1d5cc3bef2467d7596dd29bd98f16,0693c28cfb43c373fadc02d300a9fc03aee4428a..87bbecc04db6405549b4461fe444e1c85e142436
@@@ -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 642ab9b1cff8b46094559fa9c8ae295c203ca24c,a8e42222241fe92f5b818be29686c6e685cf26a8..36d454f6fedfd0d2421beb1c41538671d9110a89
@@@ -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*],
index 139ecaaebe3b001215d30e72ab1269b8b63c08d8,807801473f35685d93bccd3b9c88a615a9e4eee1..e9a8ba7b44bc9dbdf03d9b6164a54888d3476b3b
@@@ -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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Thu, 28 Sep 2023 16:36:56 +0000
++ -- Peter Micheal Greem <plugwash@raspbian.org>  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 <glondu@debian.org>  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/<multiarch>/ocaml/<abi>
+  -- Stéphane Glondu <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  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 <glondu@debian.org>  Thu, 13 Jun 2024 08:38:39 +0200
  
  ocaml (4.14.1-1) unstable; urgency=medium
  
index bb544d2c2e8274e2ec521b9ab3a95621f6c38492,0000000000000000000000000000000000000000..100dffe3ceb663324e8e1fda3f6206a593df088d
mode 100644,000000..100644
--- /dev/null
@@@ -1,15 -1,0 +1,15 @@@
- index 956d2136..a278ffe0 100644
 +From: Peter Michael Green <plugwash@raspbian.org>
 +Subject: Remove gitattributes that cause problems for dgit.
 +
 +diff --git a/.gitattributes b/.gitattributes
- @@ -151,7 +151,6 @@ menhir-bench.bash typo.missing-header typo.utf8
++index 0693c28c..87bbecc0 100644
 +--- a/.gitattributes
 ++++ b/.gitattributes
-  aclocal.m4 typo.tab
-  configure.ac text eol=lf
++@@ -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
 + 
++ Makefile* linguist-language=Makefile
++ *.c linguist-language=C
index 8ca7c1e3e214d1d83046d6baaacd642ee53a3cd9,441a118fe9b83d13709fca5ef2e06702ed782b21..7540aa72319fd548550859d60a5dbbe0278dba7d
@@@ -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
index 8e3cc61f05b11e7f18d7b5d2b86d2a849579090a,0000000000000000000000000000000000000000..fea96a789b5a88c50f16f6a91b02e437398ca48a
mode 100644,000000..100644
--- /dev/null
@@@ -1,16 -1,0 +1,16 @@@
- index 9ac019f7..03f0fd95 100644
 +Description:  Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +Author: Peter Michael Green <plugwash@raspbian.org>
 +
 +diff --git a/configure.ac b/configure.ac
- @@ -1092,7 +1092,7 @@ AS_CASE([$host],
++index a8e42222..36d454f6 100644
 +--- a/configure.ac
 ++++ b/configure.ac
-      [arch=arm; model=armv5; system=linux_eabi],
++@@ -1375,7 +1375,7 @@ AS_CASE([$host],
 +   [armv5*-*-linux-*eabi],
- -    [arch=arm; system=linux_eabihf],
- +    [arch=arm; model=armv6; system=linux_eabihf],
++     [arch=arm; model=armv5; system=linux],
 +   [arm*-*-linux-*eabihf],
-      [arch=arm; system=linux_eabi],
++-    [arch=arm; system=linux],
+++    [arch=arm; model=armv6; system=linux],
 +   [arm*-*-linux-*eabi],
++     [arch=arm; system=linux],
 +   [arm*-*-openbsd*],
diff --cc debian/rules
Simple merge