Use ocaml_dune DH buildsystem

diff --git a/debian/changelog b/debian/changelog
index 990dc4256b47a15083c9a37d6625d399a6c71f8a..bae5c61c815736943a9c9df6dc7fd5ae6d8cd1ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-eqaf (0.9-3) UNRELEASED; urgency=medium
+
+  * Use ocaml_dune DH buildsystem
+
+ -- Stéphane Glondu <glondu@debian.org>  Sun, 13 Aug 2023 13:01:53 +0200
+
 ocaml-eqaf (0.9-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/debian/control b/debian/control
index d05ecc51cbe2efda80d195c39f23a93fa74872b0..e050491201d3d9a7d0f2b5ef2082fbd0b9e7f659 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Build-Depends:
  ocaml,
  ocaml-dune,
  libcstruct-ocaml-dev,
- dh-ocaml
+ libalcotest-ocaml-dev <!nocheck>,
+ libcrowbar-ocaml-dev <!nocheck>,
+ dh-ocaml (>= 1.2)
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-eqaf

diff --git a/debian/debian-dune b/debian/debian-dune
new file mode 100644 (file)
index 0000000..6314ff6
--- /dev/null
+++ b/debian/debian-dune
@@ -0,0 +1 @@
+eqaf

diff --git a/debian/rules b/debian/rules
index 0e3376259c781fcf938a7991f80f5ba0c25594a4..91ce70b0610ee5c17d05e3b2f630b8c40328e472 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,7 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
 include /usr/share/ocaml/ocamlvars.mk
 
-DESTDIR=$(CURDIR)/debian/tmp
-
 %:
-       dh $@ --with ocaml
-
-override_dh_auto_build:
-       dune build -p eqaf
-
-override_dh_auto_install:
-       dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=$(OCAML_STDLIB_DIR)
-       rm -f $(DESTDIR)/usr/doc/*/LICENSE*
+       dh $@ --with ocaml --buildsystem ocaml_dune