Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ulex
Commits: 0d36ee94 by Stephane Glondu at 2024-06-18T09:23:07+02:00 Fix build with OCaml 5.x - - - - - 5dd39394 by Stephane Glondu at 2024-06-18T09:23:07+02:00 Update changelog - - - - - 5a41e277 by Stephane Glondu at 2024-06-18T09:23:48+02:00 Prepare upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0002-Fix-build-with-OCaml-5.x.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +ulex (1.2-3) unstable; urgency=medium + + * Team upload + * Fix build with OCaml 5.x + + -- Stéphane Glondu <[email protected]> Tue, 18 Jun 2024 09:23:46 +0200 + ulex (1.2-2) unstable; urgency=medium [ Stéphane Glondu ] ===================================== debian/control ===================================== @@ -7,6 +7,7 @@ Build-Depends: ocaml, camlp4, ocaml-findlib, + libcamlp-streams-ocaml-dev, ocamlbuild, dh-ocaml Standards-Version: 4.6.2 ===================================== debian/patches/0002-Fix-build-with-OCaml-5.x.patch ===================================== @@ -0,0 +1,29 @@ +From: Stephane Glondu <[email protected]> +Date: Tue, 18 Jun 2024 07:46:10 +0200 +Subject: Fix build with OCaml 5.x + +--- + Makefile | 2 +- + _tags | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a50fe1c..3620f83 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + ALL=pa_ulex.cma ulexing.cma +-OCAMLBUILD=ocamlbuild -byte-plugin ++OCAMLBUILD=ocamlbuild -byte-plugin -use-ocamlfind + + all:: + $(OCAMLBUILD) $(ALL) +diff --git a/_tags b/_tags +index 4a89058..9013af1 100644 +--- a/_tags ++++ b/_tags +@@ -1,3 +1,4 @@ + "pa_ulex.ml": camlp4orf, use_camlp4 + <test.*> or "custom_ulexing.ml": use_ulex + # true: use_ulex ++true: package(camlp-streams) ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 0001-Enable-installing-to-a-target-directory-passed-from-.patch +0002-Fix-build-with-OCaml-5.x.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ulex/-/compare/59cbb8692e9b1224313c754f2c8e3fe0a125954f...5a41e277d5c321163a1eee9463c1ed24783e2430 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/ocaml-team/ulex/-/compare/59cbb8692e9b1224313c754f2c8e3fe0a125954f...5a41e277d5c321163a1eee9463c1ed24783e2430 You're receiving this email because of your account on salsa.debian.org.
