[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/1.0.4-5-g116a40e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit e88b3e475bd904d4ebc182838a649ad4808186ee
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 14 18:22:59 2012 +0200

    Fix computation of ABI with recent snapshots
    
    Since r12298, development versions have been "$ABI_$DATE" instead of
    "$ABI ($DATE)".

diff --git a/share/ocamlvars.mk b/share/ocamlvars.mk
index cbc3ad0..9ff00e6 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 | { read a b && echo $$a; })
+OCAML_ABI ?= $(shell /usr/bin/ocamlc -version | { read a && echo $${a%%_*}; })
 
 # OCaml standard library location.
 # Used internally by ocaml.mk (substituted for @OCamlStdlibDir@ in

-- 
dh-ocaml packaging