Compute an actual ABI for ocaml-compiler-libs

diff --git a/debian/control b/debian/control
index ae6cd4b6a7ecc64003652a1b4c24e58e9ac10866..1a92db23fe494c4709f59eeda490a0e3d9f606b0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libiberty-dev,
  libncurses-dev,
  zlib1g-dev,
- dh-ocaml
+ dh-ocaml (>= 1.3)
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml.git
@@ -125,10 +125,11 @@ Description: OCaml interactive interpreter and standard libraries
 Package: ocaml-compiler-libs
 Architecture: any
 Depends:
+ ${shlibs:Depends},
  ${misc:Depends},
- ocaml-${F:OCamlABI}
+ ${ocaml:Depends}
 Provides:
- ocaml-compiler-libs-${F:OCamlABI}
+ ${ocaml:Provides}
 Recommends:
  ocaml-man
 Replaces: ocaml-base-nox (<< 4)

diff --git a/debian/rules b/debian/rules
index f8a996d93dbe619260fb89e25a5e3a6a9e2ce120..2ace08df68a5c0f459841fde9e4fddeb2701c500 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -246,9 +246,9 @@ endif
 # Create .md5sums files and compute dependencies. Use $(OCAML_ABI)
 # because we know that OCaml ABI represents best dependencies for
 # OCaml package.
-       dh_ocaml -Xcompiler-libs \
-        --runtime-map ocaml:ocaml-base \
-        --checksum $(OCAML_ABI)
+       dh_ocaml \
+        --nodefined-map ocaml:Topdirs \
+        --runtime-map ocaml:ocaml-base:$(OCAML_ABI),ocaml-compiler-libs
        dh_gencontrol
 # Check that OCAML_ABI is correct
        if [ "$(OCAML_ABI)" != "$(shell boot/ocamlrun ./ocamlc -version | { read a && echo $${a%%_*}; })" ]; then \