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
-
5dd39394
by Stephane Glondu at 2024-06-18T09:23:07+02:00
-
5a41e277
by Stephane Glondu at 2024-06-18T09:23:48+02:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/0002-Fix-build-with-OCaml-5.x.patch
- debian/patches/series
Changes:
1 | +ulex (1.2-3) unstable; urgency=medium
|
|
2 | + |
|
3 | + * Team upload
|
|
4 | + * Fix build with OCaml 5.x
|
|
5 | + |
|
6 | + -- Stéphane Glondu <glondu@debian.org> Tue, 18 Jun 2024 09:23:46 +0200
|
|
7 | + |
|
1 | 8 | ulex (1.2-2) unstable; urgency=medium
|
2 | 9 | |
3 | 10 | [ Stéphane Glondu ]
|
... | ... | @@ -7,6 +7,7 @@ Build-Depends: |
7 | 7 | ocaml,
|
8 | 8 | camlp4,
|
9 | 9 | ocaml-findlib,
|
10 | + libcamlp-streams-ocaml-dev,
|
|
10 | 11 | ocamlbuild,
|
11 | 12 | dh-ocaml
|
12 | 13 | Standards-Version: 4.6.2
|
1 | +From: Stephane Glondu <steph@glondu.net>
|
|
2 | +Date: Tue, 18 Jun 2024 07:46:10 +0200
|
|
3 | +Subject: Fix build with OCaml 5.x
|
|
4 | + |
|
5 | +---
|
|
6 | + Makefile | 2 +-
|
|
7 | + _tags | 1 +
|
|
8 | + 2 files changed, 2 insertions(+), 1 deletion(-)
|
|
9 | + |
|
10 | +diff --git a/Makefile b/Makefile
|
|
11 | +index a50fe1c..3620f83 100644
|
|
12 | +--- a/Makefile
|
|
13 | ++++ b/Makefile
|
|
14 | +@@ -1,5 +1,5 @@
|
|
15 | + ALL=pa_ulex.cma ulexing.cma
|
|
16 | +-OCAMLBUILD=ocamlbuild -byte-plugin
|
|
17 | ++OCAMLBUILD=ocamlbuild -byte-plugin -use-ocamlfind
|
|
18 | +
|
|
19 | + all::
|
|
20 | + $(OCAMLBUILD) $(ALL)
|
|
21 | +diff --git a/_tags b/_tags
|
|
22 | +index 4a89058..9013af1 100644
|
|
23 | +--- a/_tags
|
|
24 | ++++ b/_tags
|
|
25 | +@@ -1,3 +1,4 @@
|
|
26 | + "pa_ulex.ml": camlp4orf, use_camlp4
|
|
27 | + <test.*> or "custom_ulexing.ml": use_ulex
|
|
28 | + # true: use_ulex
|
|
29 | ++true: package(camlp-streams) |
1 | 1 | 0001-Enable-installing-to-a-target-directory-passed-from-.patch
|
2 | +0002-Fix-build-with-OCaml-5.x.patch |