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 Update packaging - - - - - 2418b1a5 by Stephane Glondu at 2022-01-21T11:38:52+01:00 Update changelog and prepare upload to unstable - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,10 @@ -js-of-ocaml (3.11.0-1) UNRELEASED; urgency=medium +js-of-ocaml (3.11.0-1) unstable; urgency=medium * New upstream release - * Do not build doc to cut dependency cycle + * Do not build doc to bootstrap with OCaml 4.13.1 + * Bump Standards-Version to 4.6.0 - -- Stéphane Glondu <[email protected]> Sat, 25 Dec 2021 18:20:26 +0100 + -- Stéphane Glondu <[email protected]> Fri, 21 Jan 2022 11:30:21 +0100 js-of-ocaml (3.8.0-2) unstable; urgency=medium ===================================== debian/control ===================================== @@ -22,7 +22,7 @@ Build-Depends: menhir, libmenhir-ocaml-dev, dh-ocaml -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://ocsigen.org/js_of_ocaml Vcs-Browser: https://salsa.debian.org/ocaml-team/js-of-ocaml ===================================== debian/rules ===================================== @@ -1,6 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- +DEB_BUILD_OPTIONS += nodoc + DESTDIR=$(CURDIR)/debian/tmp include /usr/share/ocaml/ocamlvars.mk @@ -39,8 +41,9 @@ endif $(DUNE_INSTALL) js_of_ocaml-toplevel dune build -p js_of_ocaml-tyxml $(DUNE_INSTALL) js_of_ocaml-tyxml -# Do not build doc to cut dependency cycle -# $(MAKE) doc +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + $(MAKE) doc +endif override_dh_auto_test: # Needs ppx-expect @@ -58,9 +61,10 @@ override_dh_install: mkdir -p debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api rm -rf debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual -# doc is not built to cut dependency cycle -# cp -a _build/default/_doc/_html debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api -# cp -a _build/default/manual debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual -# sed -i \ -# 's@href=".*//maxcdn\.bootstrapcdn\.com/bootstrap.*/bootstrap\.min\.css"@href="file:///usr/share/javascript/bootstrap/css/bootstrap.min.css"@g' \ -# debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual/files/toplevel/index.html +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + cp -a _build/default/_doc/_html debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/api + cp -a _build/default/manual debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual + sed -i \ + 's@href=".*//maxcdn\.bootstrapcdn\.com/bootstrap.*/bootstrap\.min\.css"@href="file:///usr/share/javascript/bootstrap/css/bootstrap.min.css"@g' \ + debian/libjs-of-ocaml-doc/usr/share/doc/libjs-of-ocaml-doc/manual/files/toplevel/index.html +endif View it on GitLab: https://salsa.debian.org/ocaml-team/js-of-ocaml/-/compare/c823ea65c45b0b28bbb6bd59ed4de075245a785a...2418b1a5e286ac43f452509bb65cb69f7334dfea -- View it on GitLab: https://salsa.debian.org/ocaml-team/js-of-ocaml/-/compare/c823ea65c45b0b28bbb6bd59ed4de075245a785a...2418b1a5e286ac43f452509bb65cb69f7334dfea You're receiving this email because of your account on salsa.debian.org.
