Update packaging

9 files changed, 24 insertions, 33 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS
index e14070e..e14070e 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 9a04815..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-config.log
-debian/configure-stamp
diff --git a/debian/control b/debian/control
index df9a007..4682814 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,15 @@ Uploaders:
  Stéphane Glondu <glondu@debian.org>,
  Mehdi Dogguy <mehdi@debian.org>
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
+ ocaml-dune,
  ocaml-nox,
  ocaml-findlib,
+ ocaml-odoc,
+ libre-ocaml-dev,
+ libalcotest-ocaml-dev,
  dh-ocaml
+Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://github.com/ocaml-community/calendar
 Vcs-Git: https://salsa.debian.org/ocaml-team/calendar.git
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e7a4c07..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-calendarFAQ-2.6.txt
-README
-TODO
diff --git a/debian/libcalendar-ocaml-dev.docs b/debian/libcalendar-ocaml-dev.docs
new file mode 100644
index 0000000..07b5a7f
--- /dev/null
+++ b/debian/libcalendar-ocaml-dev.docs
@@ -0,0 +1 @@
+usr/doc/calendar/*
diff --git a/debian/libcalendar-ocaml-dev.install.in b/debian/libcalendar-ocaml-dev.install.in
index 6553c75..3af3a60 100644
--- a/debian/libcalendar-ocaml-dev.install.in
+++ b/debian/libcalendar-ocaml-dev.install.in
@@ -1,5 +1,8 @@
-@OCamlStdlibDir@/calendar/*.mli
-OPT: @OCamlStdlibDir@/calendar/calendarLib.a
-OPT: @OCamlStdlibDir@/calendar/calendarLib.cmx
-OPT: @OCamlStdlibDir@/calendar/calendarLib.cmxa
-@OCamlStdlibDir@/calendar/calendarLib.cmi
+@OCamlStdlibDir@/calendar/*dune*
+@OCamlStdlibDir@/calendar/*opam*
+@OCamlStdlibDir@/calendar/*.ml*
+@OCamlStdlibDir@/calendar/*.cmi
+@OCamlStdlibDir@/calendar/*.cmt*
+OPT: @OCamlStdlibDir@/calendar/*.a
+OPT: @OCamlStdlibDir@/calendar/*.cmx
+OPT: @OCamlStdlibDir@/calendar/*.cmxa
diff --git a/debian/libcalendar-ocaml-doc.doc-base b/debian/libcalendar-ocaml-doc.doc-base
index a288e52..66280c0 100644
--- a/debian/libcalendar-ocaml-doc.doc-base
+++ b/debian/libcalendar-ocaml-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: API reference manual for libcalendar-ocaml-doc (generated via OCamldoc
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libcalendar-ocaml/doc/index.html
-Files: /usr/share/doc/libcalendar-ocaml/doc/*
+Index: /usr/share/doc/libcalendar-ocaml/_html/index.html
+Files: /usr/share/doc/libcalendar-ocaml/_html/*
diff --git a/debian/libcalendar-ocaml-doc.docs b/debian/libcalendar-ocaml-doc.docs
index a2e6bd4..a674f97 100644
--- a/debian/libcalendar-ocaml-doc.docs
+++ b/debian/libcalendar-ocaml-doc.docs
@@ -1 +1 @@
-doc/
+_build/default/_doc/_html
diff --git a/debian/rules b/debian/rules
index 8ee447f..3ee3ec1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,18 @@
 #!/usr/bin/make -f
-include /usr/share/dpkg/pkg-info.mk
 include /usr/share/ocaml/ocamlvars.mk
 
 DESTDIR = $(CURDIR)/debian/tmp
-export OCAMLFIND_DESTDIR = $(DESTDIR)/$(OCAML_STDLIB_DIR)
-
-FILES_TO_BACKUP = .depend config.status
 
 %:
 	dh $@ --with ocaml
 
-override_dh_auto_configure:
-	for i in $(FILES_TO_BACKUP); do \
-		cp -xa $$i $$i.debian; \
-	done
-	./configure
-
 override_dh_auto_build:
-	make BUILD_DATE="$(shell date -u -R -d @$(SOURCE_DATE_EPOCH))"
+	dune build -p calendar
+	dune build @doc -p calendar
 
 override_dh_auto_install:
-	mkdir -p $(OCAMLFIND_DESTDIR)
-	make install
+	dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR)
+	rm -f $(DESTDIR)/usr/doc/calendar/LICENSE
 
-override_dh_auto_clean:
-	rm -rf target/
-	for i in $(FILES_TO_BACKUP); do \
-		[ ! -f $$i.debian ] || mv $$i.debian $$i; \
-	done
+override_dh_auto_test:
+	dune runtest -p calendar