Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / 
js-of-ocaml


Commits:
b959ef97 by Stephane Glondu at 2024-06-14T08:53:23+02:00
Build doc only on indep builds

- - - - -
47f09aed by Stephane Glondu at 2024-06-14T08:53:23+02:00
Update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+js-of-ocaml (5.8.2-2) UNRELEASED; urgency=medium
+
+  * Build doc only on indep builds
+
+ -- Stéphane Glondu <[email protected]>  Fri, 14 Jun 2024 08:45:11 +0200
+
 js-of-ocaml (5.8.2-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -6,7 +6,6 @@ Uploaders: Stéphane Glondu <[email protected]>
 Build-Depends:
  debhelper-compat (= 13),
  ocaml,
- ocaml-odoc <!nodoc>,
  ocaml-dune (>= 2.5),
  ocaml-findlib,
  libfindlib-ocaml-dev,
@@ -24,6 +23,8 @@ Build-Depends:
  libmenhir-ocaml-dev,
  rsync,
  dh-ocaml (>= 1.2.2)
+Build-Depends-Indep:
+ ocaml-odoc <!nodoc>
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://ocsigen.org/js_of_ocaml


=====================================
debian/rules
=====================================
@@ -6,22 +6,22 @@ include /usr/share/ocaml/ocamlvars.mk
 %:
        dh $@ --with ocaml --buildsystem ocaml_dune
 
-override_dh_auto_build:
+execute_before_dh_auto_build:
        rm -f compiler/tests-jsoo/dune         # makes the build fail on amd64
        rm -f compiler/lib-runtime/tests/dune  # makes the build fail on 
bytecode architectures
 ifeq ($(OCAML_HAVE_OCAMLOPT),no)
        sed -i 's/ native//' compiler/bin-js_of_ocaml/dune
 endif
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter libjs-of-ocaml-doc,$(shell dh_listpackages)))
        $(MAKE) doc
 endif
-       dh_auto_build
+endif
 
 override_dh_auto_test:
 # Needs ppx-expect, ppx-hash, node, Uchar.utf_decode...
 
-override_dh_install:
-       dh_install
+execute_after_dh_install-indep:
        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



View it on GitLab: 
https://salsa.debian.org/ocaml-team/js-of-ocaml/-/compare/45ac832a80f23c2d5d3035c0b522014361da8e32...47f09aedcac665b4f78710898db0223e79bed19c

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://salsa.debian.org/ocaml-team/js-of-ocaml/-/compare/45ac832a80f23c2d5d3035c0b522014361da8e32...47f09aedcac665b4f78710898db0223e79bed19c
You're receiving this email because of your account on salsa.debian.org.


Reply via email to