Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocaml-gettext
Commits:
-
5aa6398d
by Stephane Glondu at 2025-12-19T09:17:44+01:00
-
a2036bc7
by Stephane Glondu at 2025-12-19T09:18:04+01:00
-
06ea5d99
by Stephane Glondu at 2025-12-19T09:18:36+01:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/0006-xgettext-Fix-type-for-OCaml-5.4.patch
- debian/patches/series
Changes:
| 1 | +ocaml-gettext (0.5.0+really0.4.2-2) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Fix compilation with OCaml 5.4.0
|
|
| 4 | + * Remove Rules-Requires-Root
|
|
| 5 | + |
|
| 6 | + -- Stéphane Glondu <glondu@debian.org> Fri, 19 Dec 2025 09:18:11 +0100
|
|
| 7 | + |
|
| 1 | 8 | ocaml-gettext (0.5.0+really0.4.2-1) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * Team upload
|
| ... | ... | @@ -16,12 +16,11 @@ Build-Depends: camlp4, |
| 16 | 16 | libounit-ocaml-dev,
|
| 17 | 17 | ocaml-dune,
|
| 18 | 18 | ocaml-findlib,
|
| 19 | - ocaml
|
|
| 19 | + ocaml (>= 5.4.0)
|
|
| 20 | 20 | Standards-Version: 4.7.2
|
| 21 | 21 | Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-gettext.git
|
| 22 | 22 | Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-gettext
|
| 23 | 23 | Homepage: https://github.com/gildor478/ocaml-gettext
|
| 24 | -Rules-Requires-Root: no
|
|
| 25 | 24 | |
| 26 | 25 | Package: libgettext-ocaml
|
| 27 | 26 | Architecture: any
|
| 1 | +From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
| 2 | +Date: Wed, 15 Oct 2025 09:24:18 +0100
|
|
| 3 | +Subject: xgettext: Fix type for OCaml 5.4
|
|
| 4 | + |
|
| 5 | +Fixes: https://github.com/gildor478/ocaml-gettext/issues/40
|
|
| 6 | +Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
|
| 7 | + |
|
| 8 | +Origin: https://github.com/gildor478/ocaml-gettext/pull/41
|
|
| 9 | +---
|
|
| 10 | + src/bin/ocaml-xgettext/xgettext.ml | 2 +-
|
|
| 11 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 12 | + |
|
| 13 | +diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml
|
|
| 14 | +index 8f54efc..aa12aed 100644
|
|
| 15 | +--- a/src/bin/ocaml-xgettext/xgettext.ml
|
|
| 16 | ++++ b/src/bin/ocaml-xgettext/xgettext.ml
|
|
| 17 | +@@ -112,7 +112,7 @@ let rec is_like lid = function
|
|
| 18 | + | [] -> false
|
|
| 19 | + | func :: functions -> (
|
|
| 20 | + match lid with
|
|
| 21 | +- | (Lident f | Ldot (_, f)) when f = func -> true
|
|
| 22 | ++ | (Lident f | Ldot (_, {txt = f; _})) when f = func -> true
|
|
| 23 | + | _ -> is_like lid functions )
|
|
| 24 | +
|
|
| 25 | + let visit_expr (iterator : Ast_iterator.iterator) expr = |
| ... | ... | @@ -3,3 +3,4 @@ |
| 3 | 3 | 0003-Fix-compilation-with-camomile-2.0.0.patch
|
| 4 | 4 | 0004-Fix-compilation-with-OCaml-5.x.patch
|
| 5 | 5 | 0005-Fix-compilation-with-OCaml-5.3.0.patch
|
| 6 | +0006-xgettext-Fix-type-for-OCaml-5.4.patch |