Use ocaml_dune DH buildsystemdebian/2.12.0-2

7 files changed, 45 insertions, 60 deletions

diff --git a/debian/changelog b/debian/changelog
index ef4002f..58853e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-atd (2.12.0-2) unstable; urgency=medium
+
+  * Use ocaml_dune DH buildsystem
+
+ -- Stéphane Glondu <glondu@debian.org>  Sun, 06 Aug 2023 09:33:22 +0200
+
 ocaml-atd (2.12.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 988b670..0713ff9 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  camlmix,
  texlive-latex-extra,
 # For all OCaml packages:
- dh-ocaml
+ dh-ocaml (>= 1.2.2)
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/ahrefs/atd
diff --git a/debian/debian-dune b/debian/debian-dune
new file mode 100644
index 0000000..448b60f
--- /dev/null
+++ b/debian/debian-dune
@@ -0,0 +1,5 @@
+atdgen-codec-runtime
+atd
+atdgen-runtime
+atdgen
+atdts
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..c4dc109
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+usr/doc/atdgen-codec-runtime
+usr/doc/atdgen-runtime
diff --git a/debian/patches/0001-Remove-a-test-that-fails-on-i386.patch b/debian/patches/0001-Remove-a-test-that-fails-on-i386.patch
index 05b8f0d..3930004 100644
--- a/debian/patches/0001-Remove-a-test-that-fails-on-i386.patch
+++ b/debian/patches/0001-Remove-a-test-that-fails-on-i386.patch
@@ -8,9 +8,11 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901823
  atdgen/test/test_atdgen_main.ml | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)
 
---- ocaml-atd.orig/atdgen/test/test_atdgen_main.ml
-+++ ocaml-atd/atdgen/test/test_atdgen_main.ml
-@@ -180,13 +180,7 @@
+diff --git a/atdgen/test/test_atdgen_main.ml b/atdgen/test/test_atdgen_main.ml
+index c663673..9a3da62 100644
+--- a/atdgen/test/test_atdgen_main.ml
++++ b/atdgen/test/test_atdgen_main.ml
+@@ -180,13 +180,7 @@ let test_ocaml_internals () =
    Gc.compact ();
    int := 123;
    Gc.compact ();
diff --git a/debian/patches/0002-Fix-compilation-of-manual.patch b/debian/patches/0002-Fix-compilation-of-manual.patch
index 2a991de..4b59ba9 100644
--- a/debian/patches/0002-Fix-compilation-of-manual.patch
+++ b/debian/patches/0002-Fix-compilation-of-manual.patch
@@ -3,30 +3,32 @@ Date: Fri, 31 Jan 2020 13:57:28 +0100
 Subject: Fix compilation of manual
 
 ---
- manual/Makefile     | 4 ++--
- manual/atd-body.mlx | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
+ manual/Makefile       | 4 ++--
+ manual/atd-body.mlx   | 7 +++----
+ manual/atd-manual.mlx | 2 +-
+ 3 files changed, 6 insertions(+), 7 deletions(-)
 
---- ocaml-atd.orig/manual/Makefile
-+++ ocaml-atd/manual/Makefile
-@@ -11,11 +11,11 @@
+diff --git a/manual/Makefile b/manual/Makefile
+index 05b0f00..aec108b 100644
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -11,10 +11,10 @@ pdf: atd-manual.pdf
  txt: atd-manual.txt
  html: atd-manual.html
  
 -atd-manual.tex: ../atd_version.ml atd-manual.mlx
--	OCAMLPATH=../..:$$OCAMLPATH camlmix atd-manual.mlx -o atd-manual.tex
 +atd-manual.tex: ../atd/src/version.ml atd-manual.mlx
-+	OCAMLPATH=../_tmp/usr/lib/ocaml:$$OCAMLPATH camlmix atd-manual.mlx -o atd-manual.tex
+ 	OCAMLPATH=../..:$$OCAMLPATH camlmix atd-manual.mlx -o atd-manual.tex
  
 -atd-body.tex: ../atd_version.ml macros.ml atd-body.mlx
--	OCAMLPATH=../..:$$OCAMLPATH camlmix atd-body.mlx -o atd-body.tex
 +atd-body.tex: ../atd/src/version.ml macros.ml atd-body.mlx
-+	OCAMLPATH=../_tmp/usr/lib/ocaml:$$OCAMLPATH camlmix atd-body.mlx -o atd-body.tex
+ 	OCAMLPATH=../..:$$OCAMLPATH camlmix atd-body.mlx -o atd-body.tex
  
  atd-manual.txt: $(addsuffix .tex, $(TEXFILES))
- 	rm -f *.aux
---- ocaml-atd.orig/manual/atd-body.mlx
-+++ ocaml-atd/manual/atd-body.mlx
+diff --git a/manual/atd-body.mlx b/manual/atd-body.mlx
+index 21d79a8..df5de31 100644
+--- a/manual/atd-body.mlx
++++ b/manual/atd-body.mlx
 @@ -4,10 +4,9 @@
  #use "topfind";;
  #require "caml2html";;
@@ -40,17 +42,19 @@ Subject: Fix compilation of manual
  #use "macros.ml";;
  ##
  
-@@ -260,7 +259,7 @@
+@@ -260,7 +259,7 @@ The syntax of an ATD file can be checked with the program
  {\tt atdcat} pretty-prints its input data, optionally after some
  transformations such as monomorphization or inheritance.
  Here is the output of {\tt atdcat -help}:
 -## shell "PATH=.. atdcat -help" ##
-+## shell "PATH=../_tmp/usr/bin atdcat -help" ##
++## shell "atdcat -help" ##
  
  
  \section{ATD language}
---- ocaml-atd.orig/manual/atd-manual.mlx
-+++ ocaml-atd/manual/atd-manual.mlx
+diff --git a/manual/atd-manual.mlx b/manual/atd-manual.mlx
+index 335fcb9..87ac7b6 100644
+--- a/manual/atd-manual.mlx
++++ b/manual/atd-manual.mlx
 @@ -1,6 +1,6 @@
  % -*- latex -*-
  ##
diff --git a/debian/rules b/debian/rules
index af9faa4..f3bd789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,49 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-#export DH_OPTIONS=-v
-
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/ocaml/ocamlvars.mk
 
-export PATH := $(CURDIR)/_tmp/usr/bin:$(PATH)
-export OCAMLPATH := $(CURDIR)/_tmp$(OCAML_STDLIB_DIR)
-
-DUNE_INSTALL := dune install --destdir=$(CURDIR)/_tmp --prefix=/usr --libdir=$(OCAML_STDLIB_DIR)
-
 %:
-	dh $@ --with ocaml
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf _tmp
+	dh $@ --with ocaml --buildsystem ocaml_dune
 
-override_dh_auto_build:
+override_dh_auto_configure:
 	echo 'let version = "$(DEB_VERSION_UPSTREAM)"' > atd/src/version.ml
-	dune build -p atdgen-codec-runtime
-	$(DUNE_INSTALL) atdgen-codec-runtime
-	dune build -p atd
-	$(DUNE_INSTALL) atd
-	dune build -p atdgen-runtime
-	$(DUNE_INSTALL) atdgen-runtime
-	dune build -p atdgen
-	$(DUNE_INSTALL) atdgen
-	dune build -p atdts
-	$(DUNE_INSTALL) atdts
-	$(MAKE) -C manual
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	dune runtest -p atdgen-codec-runtime
-	dune runtest -p atd
-	dune runtest -p atdgen-runtime
-	dune runtest -p atdgen
-	dune runtest -p atdts
-endif
 
-override_dh_auto_install:
-	rm -rf debian/tmp
-	cp -a _tmp debian/tmp
-	rm -rf debian/tmp/usr/doc/atdgen*runtime debian/tmp/usr/doc/*/LICENSE.md
+override_dh_auto_build:
+	dh_auto_build
+	dune exec -p $(shell xargs echo < debian/debian-dune | tr ' ' ',') -- $(MAKE) -C manual