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
-
72ad8517
by Stephane Glondu at 2025-12-17T14:01:48+01:00
-
33821fae
by Stephane Glondu at 2025-12-17T14:01:48+01:00
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:
| 1 | +ocamlbuild (0.16.1-2) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Team upload
|
|
| 4 | + * Fix PrincipalFlag test with OCaml 5.4.0
|
|
| 5 | + * Bump Standards-Version to 4.7.2
|
|
| 6 | + * Remove Rules-Requires-Root
|
|
| 7 | + |
|
| 8 | + -- Stéphane Glondu <glondu@debian.org> Wed, 17 Dec 2025 14:01:23 +0100
|
|
| 9 | + |
|
| 1 | 10 | ocamlbuild (0.16.1-1) unstable; urgency=medium
|
| 2 | 11 | |
| 3 | 12 | * New upstream release
|
| ... | ... | @@ -9,8 +9,7 @@ Build-Depends: |
| 9 | 9 | ocaml (>= 4.13.1),
|
| 10 | 10 | ocaml-findlib,
|
| 11 | 11 | libfindlib-ocaml-dev,
|
| 12 | -Standards-Version: 4.6.2
|
|
| 13 | -Rules-Requires-Root: no
|
|
| 12 | +Standards-Version: 4.7.2
|
|
| 14 | 13 | Homepage: https://github.com/ocaml/ocamlbuild/
|
| 15 | 14 | Vcs-Git: https://salsa.debian.org/ocaml-team/ocamlbuild.git
|
| 16 | 15 | Vcs-Browser: https://salsa.debian.org/ocaml-team/ocamlbuild
|
| ... | ... | @@ -8,7 +8,7 @@ Subject: Disable tests that fail stupidly with OCaml 5.2.0 |
| 8 | 8 | 2 files changed, 7 insertions(+), 1 deletion(-)
|
| 9 | 9 | |
| 10 | 10 | diff --git a/Makefile b/Makefile
|
| 11 | -index 3039625..d891b29 100644
|
|
| 11 | +index 934361a..e8a85e5 100644
|
|
| 12 | 12 | --- a/Makefile
|
| 13 | 13 | +++ b/Makefile
|
| 14 | 14 | @@ -221,7 +221,7 @@ endif
|
| 1 | +From: Stephane Glondu <steph@glondu.net>
|
|
| 2 | +Date: Wed, 17 Dec 2025 13:55:33 +0100
|
|
| 3 | +Subject: Fix PrincipalFlag test with OCaml 5.4.0
|
|
| 4 | + |
|
| 5 | +---
|
|
| 6 | + testsuite/internal.ml | 8 +++++++-
|
|
| 7 | + 1 file changed, 7 insertions(+), 1 deletion(-)
|
|
| 8 | + |
|
| 9 | +diff --git a/testsuite/internal.ml b/testsuite/internal.ml
|
|
| 10 | +index c7bfebc..3e58add 100644
|
|
| 11 | +--- a/testsuite/internal.ml
|
|
| 12 | ++++ b/testsuite/internal.ml
|
|
| 13 | +@@ -366,11 +366,17 @@ else if Sys.ocaml_version < "4.12.0" then
|
|
| 14 | + 2 | let f x = (x.bar; x.foo)
|
|
| 15 | + ^^^
|
|
| 16 | + Warning 18: this type-based field disambiguation is not principal.|}
|
|
| 17 | +-else
|
|
| 18 | ++else if Sys.ocaml_version < "5.4.0" then
|
|
| 19 | + {|File "hello.ml", line 2, characters 20-23:
|
|
| 20 | + 2 | let f x = (x.bar; x.foo)
|
|
| 21 | + ^^^
|
|
| 22 | + Warning 18 [not-principal]: this type-based field disambiguation is not principal.|}
|
|
| 23 | ++else
|
|
| 24 | ++{|File "hello.ml", line 2, characters 20-23:
|
|
| 25 | ++2 | let f x = (x.bar; x.foo)
|
|
| 26 | ++ ^^^
|
|
| 27 | ++Warning 18 [not-principal]: this type-based field disambiguation is not
|
|
| 28 | ++ principal.|}
|
|
| 29 | + )
|
|
| 30 | + ~targets:("hello.byte",[]) ();;
|
|
| 31 | + |
| 1 | 1 | 0002-Disable-tests-that-fail-stupidly-with-OCaml-5.2.0.patch
|
| 2 | +0002-Fix-PrincipalFlag-test-with-OCaml-5.4.0.patch |