Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocamlbuild
Commits: 01f90036 by Stephane Glondu at 2025-12-17T13:55:44+01:00 Fix PrincipalFlag test with OCaml 5.4.0 - - - - - 72ad8517 by Stephane Glondu at 2025-12-17T14:01:48+01:00 Update packaging - - - - - 33821fae by Stephane Glondu at 2025-12-17T14:01:48+01:00 Update changelog and prepare upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/0002-Disable-tests-that-fail-stupidly-with-OCaml-5.2.0.patch - + debian/patches/0002-Fix-PrincipalFlag-test-with-OCaml-5.4.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +ocamlbuild (0.16.1-2) unstable; urgency=medium + + * Team upload + * Fix PrincipalFlag test with OCaml 5.4.0 + * Bump Standards-Version to 4.7.2 + * Remove Rules-Requires-Root + + -- Stéphane Glondu <[email protected]> Wed, 17 Dec 2025 14:01:23 +0100 + ocamlbuild (0.16.1-1) unstable; urgency=medium * New upstream release ===================================== debian/control ===================================== @@ -9,8 +9,7 @@ Build-Depends: ocaml (>= 4.13.1), ocaml-findlib, libfindlib-ocaml-dev, -Standards-Version: 4.6.2 -Rules-Requires-Root: no +Standards-Version: 4.7.2 Homepage: https://github.com/ocaml/ocamlbuild/ Vcs-Git: https://salsa.debian.org/ocaml-team/ocamlbuild.git Vcs-Browser: https://salsa.debian.org/ocaml-team/ocamlbuild ===================================== debian/patches/0002-Disable-tests-that-fail-stupidly-with-OCaml-5.2.0.patch ===================================== @@ -8,7 +8,7 @@ Subject: Disable tests that fail stupidly with OCaml 5.2.0 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3039625..d891b29 100644 +index 934361a..e8a85e5 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,7 @@ endif ===================================== debian/patches/0002-Fix-PrincipalFlag-test-with-OCaml-5.4.0.patch ===================================== @@ -0,0 +1,31 @@ +From: Stephane Glondu <[email protected]> +Date: Wed, 17 Dec 2025 13:55:33 +0100 +Subject: Fix PrincipalFlag test with OCaml 5.4.0 + +--- + testsuite/internal.ml | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/testsuite/internal.ml b/testsuite/internal.ml +index c7bfebc..3e58add 100644 +--- a/testsuite/internal.ml ++++ b/testsuite/internal.ml +@@ -366,11 +366,17 @@ else if Sys.ocaml_version < "4.12.0" then + 2 | let f x = (x.bar; x.foo) + ^^^ + Warning 18: this type-based field disambiguation is not principal.|} +-else ++else if Sys.ocaml_version < "5.4.0" then + {|File "hello.ml", line 2, characters 20-23: + 2 | let f x = (x.bar; x.foo) + ^^^ + Warning 18 [not-principal]: this type-based field disambiguation is not principal.|} ++else ++{|File "hello.ml", line 2, characters 20-23: ++2 | let f x = (x.bar; x.foo) ++ ^^^ ++Warning 18 [not-principal]: this type-based field disambiguation is not ++ principal.|} + ) + ~targets:("hello.byte",[]) ();; + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 0002-Disable-tests-that-fail-stupidly-with-OCaml-5.2.0.patch +0002-Fix-PrincipalFlag-test-with-OCaml-5.4.0.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ocamlbuild/-/compare/cdcfc04e2b837858ee307b6e076b6109322c9061...33821fae78e747cf802a77590b9d9c729dcc00c4 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ocamlbuild/-/compare/cdcfc04e2b837858ee307b6e076b6109322c9061...33821fae78e747cf802a77590b9d9c729dcc00c4 You're receiving this email because of your account on salsa.debian.org.
