Update packaging

8 files changed, 13 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index 2db094b..9774d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,4 +131,3 @@ ocaml-benchmark (0.6-1) unstable; urgency=high
   * Initial Release. ( Closes: #303310 )
 
  -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org>  Sat,  3 Dec 2005 01:55:44 +0100
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 89de59d..f39f513 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,14 @@ Source: ocaml-benchmark
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
-Uploaders: Hendrik Tews <hendrik@askra.de>
 Build-Depends:
- debhelper (>= 9),
- dh-ocaml (>= 0.9.1),
- ocaml-nox (>= 3.10.0-9),
- ocaml-best-compilers,
- ocaml-findlib (>= 1.1.2pl1-4),
- ocamlbuild,
+ debhelper-compat (= 13),
+ dh-ocaml,
+ ocaml-nox,
+ ocaml-dune,
  libpcre-ocaml-dev
-Standards-Version: 3.9.6
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-benchmark.git
 Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-benchmark
 Homepage: https://github.com/Chris00/ocaml-benchmark
diff --git a/debian/copyright b/debian/copyright
index 26014ba..e0fdedc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ocaml-benchmark
 Upstream-Contact: Christophe.Troestler@umons.ac.be
-Source: http://ocaml-benchmark.forge.ocamlcore.org/
 
 Files: *
 Copyright: (C) 2002-2003, Doug Bagley
diff --git a/debian/libbenchmark-ocaml-dev.docs b/debian/libbenchmark-ocaml-dev.docs
index b43bf86..f006444 100644
--- a/debian/libbenchmark-ocaml-dev.docs
+++ b/debian/libbenchmark-ocaml-dev.docs
@@ -1 +1 @@
-README.md
+usr/doc/benchmark/*
diff --git a/debian/libbenchmark-ocaml-dev.install.in b/debian/libbenchmark-ocaml-dev.install.in
new file mode 100644
index 0000000..c073c4b
--- /dev/null
+++ b/debian/libbenchmark-ocaml-dev.install.in
@@ -0,0 +1 @@
+@OCamlStdlibDir@/benchmark
diff --git a/debian/libbenchmark-ocaml-dev.ocamldoc b/debian/libbenchmark-ocaml-dev.ocamldoc
index 6b5948a..e69de29 100644
--- a/debian/libbenchmark-ocaml-dev.ocamldoc
+++ b/debian/libbenchmark-ocaml-dev.ocamldoc
@@ -1 +0,0 @@
--d html/api --doc-base-generate
diff --git a/debian/rules b/debian/rules
index 6e21371..8950c3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,32 +4,16 @@
 # export DH_VERBOSE=1
 # export DH_OPTIONS=-v
 
-DESTDIR=$(CURDIR)/debian/libbenchmark-ocaml-dev
+DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_DESTDIR
-OCAMLFIND_LDCONF=ignore
-export OCAMLFIND_LDCONF
-
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	ocaml setup.ml -clean
-
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libbenchmark-ocaml-dev/html
-
-.PHONY: override_dh_auto_build
 override_dh_auto_build:
-	ocaml setup.ml -build
-	ocaml setup.ml -doc
+	dune build -p benchmark
 
-.PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	ocaml setup.ml -install 
+	dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR)
+	rm -f $(DESTDIR)/usr/doc/benchmark/LICENSE.md