Update packaging

diff --git a/debian/changelog b/debian/changelog
index c103f81b0e1eff0e12c4c7124474b1e793f2bd7c..f63792e0fbe12365c004e92a17214391d366ee88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-cohttp (5.1.0-2) unstable; urgency=medium
+
+  * Use ocaml_dune DH buildsystem
+  * Bump Standards-Version to 4.6.2
+
+ -- Stéphane Glondu <glondu@debian.org>  Mon, 07 Aug 2023 05:10:19 +0200
+
 ocaml-cohttp (5.1.0-1) unstable; urgency=medium
 
   * Add deps on ppx-sexp-conv by hand... why!?

diff --git a/debian/control b/debian/control
index 4340f796270462e36974ccc70b833917b9852830..f392a7653ebf3cda12d14aa4bf282936e57e6a7b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Stéphane Glondu <glondu@debian.org>
 Build-Depends: debhelper-compat (= 13),
-               dh-ocaml,
+               dh-ocaml (>= 1.2.2),
                libalcotest-ocaml-dev <!nocheck>,
                libbase64-ocaml-dev,
                libconduit-lwt-ocaml-dev,
@@ -21,8 +21,8 @@ Build-Depends: debhelper-compat (= 13),
                liburi-ocaml-dev,
                netbase,
                ocaml-dune,
-               ocaml-nox
-Standards-Version: 4.6.0
+               ocaml
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/mirage/ocaml-cohttp
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-cohttp.git

diff --git a/debian/debian-dune b/debian/debian-dune
new file mode 100644 (file)
index 0000000..4609eb9
--- /dev/null
+++ b/debian/debian-dune
@@ -0,0 +1,4 @@
+cohttp
+cohttp-lwt
+cohttp-lwt-unix
+cohttp-lwt-jsoo

diff --git a/debian/rules b/debian/rules
index d2be4a8ca40357d4e86c21bf73d35b3a68dad50d..91ce70b0610ee5c17d05e3b2f630b8c40328e472 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DESTDIR=$(CURDIR)/debian/tmp
-
 include /usr/share/ocaml/ocamlvars.mk
 
-DUNE_BUILD := OCAMLPATH=$(CURDIR)/_tmp$(OCAML_STDLIB_DIR) dune build -p
-DUNE_INSTALL := dune install --destdir=$(CURDIR)/_tmp --prefix=/usr --libdir=$(OCAML_STDLIB_DIR)
-DUNE_RUNTEST := OCAMLPATH=$(CURDIR)/_tmp$(OCAML_STDLIB_DIR) dune runtest -p
-
 %:
-       dh $@ --with ocaml
-
-override_dh_auto_clean:
-       dune clean
-       rm -rf _tmp
-
-override_dh_auto_build:
-       rm -rf _tmp
-       $(DUNE_BUILD) cohttp
-       $(DUNE_INSTALL) cohttp
-       $(DUNE_BUILD) cohttp-lwt
-       $(DUNE_INSTALL) cohttp-lwt
-       $(DUNE_BUILD) cohttp-lwt-unix
-       $(DUNE_INSTALL) cohttp-lwt-unix
-       $(DUNE_BUILD) cohttp-lwt-jsoo
-       $(DUNE_INSTALL) cohttp-lwt-jsoo
-
-override_dh_auto_test:
-       $(DUNE_RUNTEST) cohttp
-       $(DUNE_RUNTEST) cohttp-lwt
-       $(DUNE_RUNTEST) cohttp-lwt-unix
-       $(DUNE_RUNTEST) cohttp-lwt-jsoo
-
-override_dh_auto_install:
-       rm -rf debian/tmp
-       cp -a $(CURDIR)/_tmp debian/tmp
-       rm -rf debian/tmp/usr/doc/*/LICENSE*
+       dh $@ --with ocaml --buildsystem ocaml_dune