Update packaging

diff --git a/debian/control b/debian/control
index 61603d8e19d3053d09b053611be53e503c463af3..b90d49d45826b6a985c150ce9f9f88feaf3832f2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
 Source: ocaml-cohttp
 Section: ocaml
-Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Stéphane Glondu <glondu@debian.org>
 Build-Depends: debhelper-compat (= 13),
@@ -10,6 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                libconduit-lwt-ocaml-dev,
                libcrowbar-ocaml-dev <!nocheck>,
                libfmt-ocaml-dev <!nocheck>,
+               libppx-expect-ocaml-dev <!nocheck>,
                libjsonm-ocaml-dev,
                liblogs-ocaml-dev,
                libmagic-mime-ocaml-dev,
@@ -22,8 +22,7 @@ Build-Depends: debhelper-compat (= 13),
                netbase,
                ocaml-dune,
                ocaml
-Standards-Version: 4.7.2
-Rules-Requires-Root: no
+Standards-Version: 4.7.3
 Homepage: https://github.com/mirage/ocaml-cohttp
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-cohttp.git
 Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-cohttp

diff --git a/debian/debian-dune b/debian/debian-dune
index 4609eb943670148623158ce6ab797c2e90ad7119..231eeb33b3e4afa1e67b9c16228d372a086565c6 100644 (file)
--- a/debian/debian-dune
+++ b/debian/debian-dune
@@ -1,3 +1,4 @@
+http
 cohttp
 cohttp-lwt
 cohttp-lwt-unix

diff --git a/debian/libcohttp-lwt-unix-ocaml-dev.install.in b/debian/libcohttp-lwt-unix-ocaml-dev.install.in
index bce1b3ac0b1b52bac970cb625c6fff4750dc083f..1e1dca43a5b40616eb1fd9439059478c021683be 100644 (file)
--- a/debian/libcohttp-lwt-unix-ocaml-dev.install.in
+++ b/debian/libcohttp-lwt-unix-ocaml-dev.install.in
@@ -6,4 +6,3 @@
 OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.a
 OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.cmxa
 OPT: @OCamlStdlibDir@/cohttp-lwt-unix/*.cmx
-usr/bin/*lwt

diff --git a/debian/libcohttp-ocaml-dev.install.in b/debian/libcohttp-ocaml-dev.install.in
index 93881cc555a2c936eec1b26e1f1b37ba864a42ef..599a037a962ebd6433015582635cc088d0127aff 100644 (file)
--- a/debian/libcohttp-ocaml-dev.install.in
+++ b/debian/libcohttp-ocaml-dev.install.in
@@ -1,3 +1,17 @@
+@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*

diff --git a/debian/libcohttp-ocaml.install.in b/debian/libcohttp-ocaml.install.in
index 36562c589412799d1224c808df56c04a1832bc52..6a6f788da2b763064423c0f1e9a2bfa5a059b212 100644 (file)
--- a/debian/libcohttp-ocaml.install.in
+++ b/debian/libcohttp-ocaml.install.in
@@ -1,3 +1,8 @@
+@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

diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644 (file)
index 0000000..040bebc
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
+usr/doc/http/*