Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / js-of-ocaml
Commits:
-
72da09c7
by Stephane Glondu at 2022-01-21T11:38:52+01:00
-
2418b1a5
by Stephane Glondu at 2022-01-21T11:38:52+01:00
3 changed files:
Changes:
| 1 |
-js-of-ocaml (3.11.0-1) UNRELEASED; urgency=medium
|
|
| 1 |
+js-of-ocaml (3.11.0-1) unstable; urgency=medium
|
|
| 2 | 2 |
|
| 3 | 3 |
* New upstream release
|
| 4 |
- * Do not build doc to cut dependency cycle
|
|
| 4 |
+ * Do not build doc to bootstrap with OCaml 4.13.1
|
|
| 5 |
+ * Bump Standards-Version to 4.6.0
|
|
| 5 | 6 |
|
| 6 |
- -- Stéphane Glondu <glondu@debian.org> Sat, 25 Dec 2021 18:20:26 +0100
|
|
| 7 |
+ -- Stéphane Glondu <glondu@debian.org> Fri, 21 Jan 2022 11:30:21 +0100
|
|
| 7 | 8 |
|
| 8 | 9 |
js-of-ocaml (3.8.0-2) unstable; urgency=medium
|
| 9 | 10 |
|
| ... | ... | @@ -22,7 +22,7 @@ Build-Depends: |
| 22 | 22 |
menhir,
|
| 23 | 23 |
libmenhir-ocaml-dev,
|
| 24 | 24 |
dh-ocaml
|
| 25 |
-Standards-Version: 4.5.1
|
|
| 25 |
+Standards-Version: 4.6.0
|
|
| 26 | 26 |
Rules-Requires-Root: no
|
| 27 | 27 |
Homepage: https://ocsigen.org/js_of_ocaml
|
| 28 | 28 |
Vcs-Browser: https://salsa.debian.org/ocaml-team/js-of-ocaml
|
| 1 | 1 |
#!/usr/bin/make -f
|
| 2 | 2 |
# -*- makefile -*-
|
| 3 | 3 |
|
| 4 |
+DEB_BUILD_OPTIONS += nodoc
|
|
| 5 |
+ |
|
| 4 | 6 |
DESTDIR=$(CURDIR)/debian/tmp
|
| 5 | 7 |
|
| 6 | 8 |
include /usr/share/ocaml/ocamlvars.mk
|
| ... | ... | @@ -39,8 +41,9 @@ endif |
| 39 | 41 |
$(DUNE_INSTALL) js_of_ocaml-toplevel
|
| 40 | 42 |
dune build -p js_of_ocaml-tyxml
|
| 41 | 43 |
$(DUNE_INSTALL) js_of_ocaml-tyxml
|
| 42 |
-# Do not build doc to cut dependency cycle
|
|
| 43 |
-# $(MAKE) doc
|
|
| 44 |
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
|
|
| 45 |
+ $(MAKE) doc
|
|
| 46 |
+endif
|
|
| 44 | 47 |
|
| 45 | 48 |
override_dh_auto_test:
|
| 46 | 49 |
# Needs ppx-expect
|
| ... | ... | @@ -58,9 +61,10 @@ override_dh_install: |
| 58 | 61 |
mkdir -p debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc
|
| 59 | 62 |
rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api
|
| 60 | 63 |
rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual
|
| 61 |
-# doc is not built to cut dependency cycle
|
|
| 62 |
-# cp -a _build/default/_doc/_html debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api
|
|
| 63 |
-# cp -a _build/default/manual debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual
|
|
| 64 |
-# sed -i \
|
|
| 65 |
-# 's@href=""@href=""@g' \
|
|
| 66 |
-# debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual/files/toplevel/index.html
|
|
| 64 |
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
|
|
| 65 |
+ cp -a _build/default/_doc/_html debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api
|
|
| 66 |
+ cp -a _build/default/manual debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual
|
|
| 67 |
+ sed -i \
|
|
| 68 |
+ 's@href=""@href=""@g' \
|
|
| 69 |
+ debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual/files/toplevel/index.html
|
|
| 70 |
+endif
|