Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / morbig
Commits: dddb5be8 by Stephane Glondu at 2026-07-14T08:09:19+02:00 Fix compilation with menhir 20260209 - - - - - 7208558f by Stephane Glondu at 2026-07-14T08:11:08+02:00 Update packaging - - - - - f4bca038 by Stephane Glondu at 2026-07-14T08:12:00+02:00 Update changelog and prepare upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0003-Fix-compilation-with-menhir-20260209.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +morbig (0.11.0-7) unstable; urgency=medium + + * Team upload + * Fix compilation with menhir 20260209 + * Bump debhelper compat level to 14 + + -- Stéphane Glondu <[email protected]> Tue, 14 Jul 2026 08:11:58 +0200 + morbig (0.11.0-6) unstable; urgency=medium * Build C module on native architectures ===================================== debian/control ===================================== @@ -3,13 +3,13 @@ Section: ocaml Maintainer: Debian OCaml Maintainers <[email protected]> Uploaders: Ralf Treinen <[email protected]>, Build-Depends: - debhelper-compat (= 13), + debhelper-compat (= 14), dh-ocaml (>= 3.2~), ocaml (>= 4.11), ocaml-dune, ocaml-findlib, ocamlbuild, - menhir (>= 20170509), + menhir (>= 20260209), libmenhir-ocaml-dev (>= 20170509), libppx-deriving-yojson-ocaml-dev, libppx-visitors-ocaml-dev (>= 20180513), ===================================== debian/patches/0003-Fix-compilation-with-menhir-20260209.patch ===================================== @@ -0,0 +1,30 @@ +From: Stephane Glondu <[email protected]> +Date: Tue, 14 Jul 2026 08:08:38 +0200 +Subject: Fix compilation with menhir 20260209 + +--- + src/ExtMenhirLib.ml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/ExtMenhirLib.ml b/src/ExtMenhirLib.ml +index 332a47e..0a5d52e 100644 +--- a/src/ExtMenhirLib.ml ++++ b/src/ExtMenhirLib.ml +@@ -10,13 +10,13 @@ + (**************************************************************************) + + open Parser.MenhirInterpreter +-open MenhirLib.General ++open MenhirLib + + let current_items parsing_state = +- match Lazy.force (stack parsing_state) with +- | Nil -> ++ match top parsing_state with ++ | None -> + [] +- | Cons (Element (s, _, _, _), _) -> ++ | Some (Element (s, _, _, _)) -> + items s + + type 'a status = ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ generate-documentation 0002-Adapt-to-yojson-3.0.0.patch +0003-Fix-compilation-with-menhir-20260209.patch View it on GitLab: https://salsa.debian.org/ocaml-team/morbig/-/compare/d5e2b4de892a2ea3cc43a97d9ee9ddffb9496f10...f4bca038d1b681fdd63f6d9b7c2ae5a2f1904e81 -- View it on GitLab: https://salsa.debian.org/ocaml-team/morbig/-/compare/d5e2b4de892a2ea3cc43a97d9ee9ddffb9496f10...f4bca038d1b681fdd63f6d9b7c2ae5a2f1904e81 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
