From 78418ec047e5ec28eadf397ae618102d98196e60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Glondu?= Date: Fri, 18 Aug 2023 16:17:14 +0200 Subject: [PATCH] Compute an actual ABI for ocaml-compiler-libs --- debian/control | 7 ++++--- debian/rules | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index ae6cd4b6..1a92db23 100644 --- 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 f8a996d9..2ace08df 100755 --- 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 \ -- 2.30.2