Update packaging

5 files changed, 12 insertions, 35 deletions

diff --git a/debian/compat b/debian/compat
index ec63514..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+12
diff --git a/debian/control b/debian/control
index c4c362a..0ae3eef 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
   ocaml-best-compilers,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 9),
+  debhelper (>= 12),
+  jbuilder,
   libeasy-format-ocaml-dev
 Standards-Version: 3.9.8
 Homepage: https://github.com/mjambon/biniou
diff --git a/debian/libbiniou-ocaml-dev.docs b/debian/libbiniou-ocaml-dev.docs
index eedd89b..d62e8b4 100644
--- a/debian/libbiniou-ocaml-dev.docs
+++ b/debian/libbiniou-ocaml-dev.docs
@@ -1 +1 @@
-api
+usr/doc/biniou/*
diff --git a/debian/libbiniou-ocaml-dev.install.in b/debian/libbiniou-ocaml-dev.install.in
index a4a290c..8f5af61 100644
--- a/debian/libbiniou-ocaml-dev.install.in
+++ b/debian/libbiniou-ocaml-dev.install.in
@@ -1,9 +1,9 @@
-@OCamlStdlibDir@/biniou/*.annot
+@OCamlStdlibDir@/biniou/*dune*
+@OCamlStdlibDir@/biniou/*opam*
 @OCamlStdlibDir@/biniou/*.cmt
-@OCamlStdlibDir@/biniou/*.cmo
+@OCamlStdlibDir@/biniou/*.cmti
 @OCamlStdlibDir@/biniou/*.cmi
 @OCamlStdlibDir@/biniou/*.ml*
-OPT: @OCamlStdlibDir@/biniou/*.o
 OPT: @OCamlStdlibDir@/biniou/*.cmxa
 OPT: @OCamlStdlibDir@/biniou/*.a
 OPT: @OCamlStdlibDir@/biniou/*.cmx
diff --git a/debian/rules b/debian/rules
index 4e307ad..c8b08b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,39 +9,15 @@ 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_build
 override_dh_auto_build:
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	$(MAKE)
-else
-	$(MAKE) all bdump.byte
-endif 
-	$(MAKE) doc
-
+	jbuilder build -p biniou
 
-.PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	mkdir -p '$(DESTDIR)/usr/bin'
-	make install 'BINDIR=$(DESTDIR)/usr/bin'
-
-
-.PHONY: override_dh_install
-override_dh_install:
-	dh_install --fail-missing
-
+	jbuilder install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR)
+	rm -f $(DESTDIR)/usr/doc/biniou/LICENSE
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
-	mkdir api
-	mv doc api/html
-	dh_installdocs
+override_dh_missing:
+	dh_missing --fail-missing