Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocaml-expect
Commits:
-
7c11a37c
by Stephane Glondu at 2024-07-03T05:30:36+02:00
-
d3d03796
by Stephane Glondu at 2024-07-03T05:30:36+02:00
3 changed files:
Changes:
1 | +ocaml-expect (0.0.6-4) unstable; urgency=medium
|
|
2 | + |
|
3 | + * Team upload
|
|
4 | + * Fix compilation with recent toolchain (Closes: #1074732, #1073894)
|
|
5 | + |
|
6 | + -- Stéphane Glondu <glondu@debian.org> Wed, 03 Jul 2024 05:13:02 +0200
|
|
7 | + |
|
1 | 8 | ocaml-expect (0.0.6-3) unstable; urgency=medium
|
2 | 9 | |
3 | 10 | * Team upload
|
... | ... | @@ -5,6 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> |
5 | 5 | Build-Depends:
|
6 | 6 | ocaml,
|
7 | 7 | ocaml-findlib,
|
8 | + libcamlp-streams-ocaml-dev,
|
|
8 | 9 | libre-ocaml-dev,
|
9 | 10 | libounit-ocaml-dev (>= 2.0.0),
|
10 | 11 | libbatteries-ocaml-dev,
|
... | ... | @@ -11,28 +11,27 @@ include /usr/share/ocaml/ocamlvars.mk |
11 | 11 | OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
|
12 | 12 | export OCAMLFIND_DESTDIR
|
13 | 13 | |
14 | +SETUP := ocaml -I +compiler-libs -I +camlp-streams camlp_streams.cma setup.ml
|
|
15 | + |
|
14 | 16 | %:
|
15 | 17 | dh $@ --with ocaml
|
16 | 18 | |
17 | -.PHONY: override_dh_auto_configure
|
|
18 | 19 | override_dh_auto_configure:
|
19 | - ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir '/usr/share/doc/libexpect-ocaml-dev'
|
|
20 | + $(SETUP) -configure --prefix /usr --destdir '$(DESTDIR)' --docdir '/usr/share/doc/libexpect-ocaml-dev'
|
|
20 | 21 | |
21 | -.PHONY: override_dh_auto_build
|
|
22 | 22 | override_dh_auto_build:
|
23 | - ocaml setup.ml -build
|
|
24 | - ocaml setup.ml -doc
|
|
23 | + $(SETUP) -build
|
|
24 | + $(SETUP) -doc
|
|
25 | 25 | |
26 | -.PHONY: override_dh_auto_test
|
|
27 | 26 | override_dh_auto_test:
|
28 | - ocaml setup.ml -test
|
|
27 | +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
|
28 | + $(SETUP) -test
|
|
29 | +endif
|
|
29 | 30 | |
30 | -.PHONY: override_dh_auto_install
|
|
31 | 31 | override_dh_auto_install:
|
32 | 32 | mkdir -p '$(DESTDIR)/usr/bin'
|
33 | 33 | mkdir -p '$(OCAMLFIND_DESTDIR)'
|
34 | - ocaml setup.ml -install
|
|
34 | + $(SETUP) -install
|
|
35 | 35 | |
36 | -.PHONY: override_dh_auto_clean
|
|
37 | 36 | override_dh_auto_clean:
|
38 | - ocaml setup.ml -distclean |
|
37 | + $(SETUP) -distclean |