From fcd8a53c927990b3389b99dd310cfc85cb48ff10 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Tue, 12 May 2026 09:16:48 +0200 Subject: [PATCH] Use dh_ocamllibinstall --- debian/control | 2 +- debian/debian-dune | 6 ++--- debian/dh-ocaml.conf.json | 3 +++ .../libcohttp-lwt-jsoo-ocaml-dev.install.in | 8 ------- debian/libcohttp-lwt-jsoo-ocaml.install.in | 3 --- debian/libcohttp-lwt-ocaml-dev.install.in | 8 ------- debian/libcohttp-lwt-ocaml.install.in | 3 --- .../libcohttp-lwt-unix-ocaml-dev.install.in | 8 ------- debian/libcohttp-lwt-unix-ocaml.install.in | 3 --- debian/libcohttp-ocaml-dev.install.in | 22 ------------------- debian/libcohttp-ocaml.install.in | 8 ------- 11 files changed, 7 insertions(+), 67 deletions(-) create mode 100644 debian/dh-ocaml.conf.json delete mode 100644 debian/libcohttp-lwt-jsoo-ocaml-dev.install.in delete mode 100644 debian/libcohttp-lwt-jsoo-ocaml.install.in delete mode 100644 debian/libcohttp-lwt-ocaml-dev.install.in delete mode 100644 debian/libcohttp-lwt-ocaml.install.in delete mode 100644 debian/libcohttp-lwt-unix-ocaml-dev.install.in delete mode 100644 debian/libcohttp-lwt-unix-ocaml.install.in delete mode 100644 debian/libcohttp-ocaml-dev.install.in delete mode 100644 debian/libcohttp-ocaml.install.in diff --git a/debian/control b/debian/control index a2bc746..77c0dac 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: debhelper-compat (= 13), - dh-ocaml (>= 1.2.2), + dh-ocaml (>= 3), libalcotest-ocaml-dev , libbase64-ocaml-dev, libconduit-lwt-ocaml-dev, diff --git a/debian/debian-dune b/debian/debian-dune index 231eeb3..32a349b 100644 --- a/debian/debian-dune +++ b/debian/debian-dune @@ -1,5 +1,5 @@ http cohttp -cohttp-lwt -cohttp-lwt-unix -cohttp-lwt-jsoo +cohttp-lwt cohttp-lwt +cohttp-lwt-unix cohttp-lwt-unix +cohttp-lwt-jsoo cohttp-lwt-jsoo diff --git a/debian/dh-ocaml.conf.json b/debian/dh-ocaml.conf.json new file mode 100644 index 0000000..22658d2 --- /dev/null +++ b/debian/dh-ocaml.conf.json @@ -0,0 +1,3 @@ +{ + "dh_ocamllibinstall": true +} diff --git a/debian/libcohttp-lwt-jsoo-ocaml-dev.install.in b/debian/libcohttp-lwt-jsoo-ocaml-dev.install.in deleted file mode 100644 index e77686d..0000000 --- a/debian/libcohttp-lwt-jsoo-ocaml-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt-jsoo/*opam* -@OCamlStdlibDir@/cohttp-lwt-jsoo/*dune* -@OCamlStdlibDir@/cohttp-lwt-jsoo/*.cmt* -@OCamlStdlibDir@/cohttp-lwt-jsoo/*.cmi -@OCamlStdlibDir@/cohttp-lwt-jsoo/*.ml* -OPT: @OCamlStdlibDir@/cohttp-lwt-jsoo/*.a -OPT: @OCamlStdlibDir@/cohttp-lwt-jsoo/*.cmxa -OPT: @OCamlStdlibDir@/cohttp-lwt-jsoo/*.cmx diff --git a/debian/libcohttp-lwt-jsoo-ocaml.install.in b/debian/libcohttp-lwt-jsoo-ocaml.install.in deleted file mode 100644 index 707b04a..0000000 --- a/debian/libcohttp-lwt-jsoo-ocaml.install.in +++ /dev/null @@ -1,3 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt-jsoo/META -@OCamlStdlibDir@/cohttp-lwt-jsoo/*.cma -DYN: @OCamlStdlibDir@/cohttp-lwt-jsoo/*.cmxs diff --git a/debian/libcohttp-lwt-ocaml-dev.install.in b/debian/libcohttp-lwt-ocaml-dev.install.in deleted file mode 100644 index 0508b41..0000000 --- a/debian/libcohttp-lwt-ocaml-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt/*opam* -@OCamlStdlibDir@/cohttp-lwt/*dune* -@OCamlStdlibDir@/cohttp-lwt/*.cmt* -@OCamlStdlibDir@/cohttp-lwt/*.cmi -@OCamlStdlibDir@/cohttp-lwt/*.ml* -OPT: @OCamlStdlibDir@/cohttp-lwt/*.a -OPT: @OCamlStdlibDir@/cohttp-lwt/*.cmxa -OPT: @OCamlStdlibDir@/cohttp-lwt/*.cmx diff --git a/debian/libcohttp-lwt-ocaml.install.in b/debian/libcohttp-lwt-ocaml.install.in deleted file mode 100644 index 087c462..0000000 --- a/debian/libcohttp-lwt-ocaml.install.in +++ /dev/null @@ -1,3 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt/META -@OCamlStdlibDir@/cohttp-lwt/*.cma -DYN: @OCamlStdlibDir@/cohttp-lwt/*.cmxs diff --git a/debian/libcohttp-lwt-unix-ocaml-dev.install.in b/debian/libcohttp-lwt-unix-ocaml-dev.install.in deleted file mode 100644 index 1e1dca4..0000000 --- a/debian/libcohttp-lwt-unix-ocaml-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt-unix/*opam* -@OCamlStdlibDir@/cohttp-lwt-unix/*dune* -@OCamlStdlibDir@/cohttp-lwt-unix/*.cmt* -@OCamlStdlibDir@/cohttp-lwt-unix/*.cmi -@OCamlStdlibDir@/cohttp-lwt-unix/*.ml* -OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.a -OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.cmxa -OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.cmx diff --git a/debian/libcohttp-lwt-unix-ocaml.install.in b/debian/libcohttp-lwt-unix-ocaml.install.in deleted file mode 100644 index 31dc600..0000000 --- a/debian/libcohttp-lwt-unix-ocaml.install.in +++ /dev/null @@ -1,3 +0,0 @@ -@OCamlStdlibDir@/cohttp-lwt-unix/META -@OCamlStdlibDir@/cohttp-lwt-unix/*.cma -DYN: @OCamlStdlibDir@/cohttp-lwt-unix/*.cmxs diff --git a/debian/libcohttp-ocaml-dev.install.in b/debian/libcohttp-ocaml-dev.install.in deleted file mode 100644 index 599a037..0000000 --- a/debian/libcohttp-ocaml-dev.install.in +++ /dev/null @@ -1,22 +0,0 @@ -@OCamlStdlibDir@/http/*opam* -@OCamlStdlibDir@/http/*dune* -@OCamlStdlibDir@/http/*.cmt* -@OCamlStdlibDir@/http/*.cmi -@OCamlStdlibDir@/http/*.ml* -OPT: @OCamlStdlibDir@/http/*.a -OPT: @OCamlStdlibDir@/http/*.cmxa -OPT: @OCamlStdlibDir@/http/*.cmx -@OCamlStdlibDir@/http/*/*/.public_cmi/*.cmt* -@OCamlStdlibDir@/http/*/*/.public_cmi/*.cmi -@OCamlStdlibDir@/http/*/*/*.ml* -OPT: @OCamlStdlibDir@/http/*/*/*.a -OPT: @OCamlStdlibDir@/http/*/*/*.cmxa -OPT: @OCamlStdlibDir@/http/*/*/*.cmx -@OCamlStdlibDir@/cohttp/*opam* -@OCamlStdlibDir@/cohttp/*dune* -@OCamlStdlibDir@/cohttp/*.cmt* -@OCamlStdlibDir@/cohttp/*.cmi -@OCamlStdlibDir@/cohttp/*.ml* -OPT: @OCamlStdlibDir@/cohttp/*.a -OPT: @OCamlStdlibDir@/cohttp/*.cmxa -OPT: @OCamlStdlibDir@/cohttp/*.cmx diff --git a/debian/libcohttp-ocaml.install.in b/debian/libcohttp-ocaml.install.in deleted file mode 100644 index 6a6f788..0000000 --- a/debian/libcohttp-ocaml.install.in +++ /dev/null @@ -1,8 +0,0 @@ -@OCamlStdlibDir@/http/META -@OCamlStdlibDir@/http/*.cma -DYN: @OCamlStdlibDir@/http/*.cmxs -@OCamlStdlibDir@/http/*/*/*.cma -DYN: @OCamlStdlibDir@/http/*/*/*.cmxs -@OCamlStdlibDir@/cohttp/META -@OCamlStdlibDir@/cohttp/*.cma -DYN: @OCamlStdlibDir@/cohttp/*.cmxs -- 2.30.2