From: Ximin Luo <infinity0@debian.org>
Date: Wed, 2 Nov 2016 13:27:08 +0000 (+0100)
Subject: Fix substvars syntax for the native case and mention in d/changelog
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~93
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2879347e8304f097d0c22fb0b91880c72d45592e;p=ocaml.git

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

diff --git a/debian/changelog b/debian/changelog
index b7284798..100e287c 100644
--- 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 449cc807..bf7f5379 100644
--- 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 e3a696e2..4a5b5399 100644
--- 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 4df28eb6..d9ec2fbe 100755
--- 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