[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/1.0.3-3-ga058ebf

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 81d621197f0bdd9b1adb50e9ccdd3fb14767cc76
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Feb 8 17:35:21 2012 +0100

    ocamlvars.mk: use only first word of `ocamlc -version` for OCAML_ABI
    
    Development versions of ocaml add a date to `ocamlc -version` which we
    don't want in the ABI.

diff --git a/share/ocamlvars.mk b/share/ocamlvars.mk
index fea42bf..cbc3ad0 100644
--- a/share/ocamlvars.mk
+++ b/share/ocamlvars.mk
@@ -27,7 +27,7 @@ _ocaml_share_vars = 1
 # current OCaml ABI version (e.g. 3.10.0).
 # Used internally by ocaml.mk (substituted for @OCamlABI@ in $(OCAML_IN_FILES)
 # below), may be useful to debian/rules writers as well
-OCAML_ABI ?= $(shell /usr/bin/ocamlc -version)
+OCAML_ABI ?= $(shell /usr/bin/ocamlc -version | { read a b && echo $$a; })
 
 # OCaml standard library location.
 # Used internally by ocaml.mk (substituted for @OCamlStdlibDir@ in

-- 
dh-ocaml packaging