Fix substvars syntax for the native case and mention in d/changelog

diff --git a/debian/changelog b/debian/changelog
index b728479892c04477ce2c1e8a248ed9a43700cbe2..100e287c957f6d53c29ea1c25be5d9c6cc65d314 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.03.0-4) UNRELEASED; urgency=medium
+
+  * Add a versioned Provides so we can have versioned Build-Depends
+    on ocaml-best-compilers in other packages.
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 02 Nov 2016 14:26:43 +0100
+
 ocaml (4.03.0-3) experimental; urgency=medium
 
   * Default to PIC on arm, to fix failing armhf tests.

diff --git a/debian/control b/debian/control
index 449cc807fe9893096aab15911c1ed5e391b83327..bf7f5379c2417224e541587866ee437b68d04340 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Depends:
  binutils
 Provides:
  ${ocaml:Provides},
- ${F:BestProvides} (= ${binary:Version}),
+ ${F:BestProvides},
  libnums-ocaml-dev
 Suggests:
  ocaml-doc,

diff --git a/debian/control.in b/debian/control.in
index e3a696e2a58630c87481f6cebcd14c597b5f44b3..4a5b53997522e07c19ce2ac2ea66ee80e914f899 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -37,7 +37,7 @@ Depends:
  binutils
 Provides:
  ${ocaml:Provides},
- ${F:BestProvides} (= ${binary:Version}),
+ ${F:BestProvides},
  libnums-ocaml-dev
 Suggests:
  ocaml-doc,

diff --git a/debian/rules b/debian/rules
index 4df28eb6f59b5b3c6d03f87e6f8b76ed1387e419..d9ec2fbeeb589528a250bb3fc0fb24a80194b196 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -248,7 +248,7 @@ override_dh_gencontrol:
          echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
        done
 ifeq (,$(OCAML_OPT_ARCH))
-       echo 'F:BestProvides=ocaml-best-compilers' >> debian/ocaml-nox.substvars
+       echo 'F:BestProvides=ocaml-best-compilers (= ${binary:Version})' >> debian/ocaml-nox.substvars
 else
        echo 'F:BestProvides=' >> debian/ocaml-nox.substvars
 endif