[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-2-8-ge1bb0fd

Stephane Glondu steph at glondu.net
Wed Apr 11 12:46:11 UTC 2012


The following commit has been merged in the master branch:
commit e98ceaa800d49e874f436f8b7b0b426e1111020f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Apr 3 08:39:49 2012 +0200

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

diff --git a/debian/rules b/debian/rules
index 640a5d2..3da32e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -250,7 +250,7 @@ endif
 	 --checksum $(OCAML_ABI)
 	dh_gencontrol
 # Check that OCAML_ABI is correct
-	if [ "$(OCAML_ABI)" != "$(shell boot/ocamlrun ./ocamlc -version | { read a b && echo $$a; })" ]; then \
+	if [ "$(OCAML_ABI)" != "$(shell boot/ocamlrun ./ocamlc -version | { read a && echo $${a%%_*}; })" ]; then \
 	  echo "Please adjust OCAML_ABI in debian/rules"; \
 	  exit 2; \
 	fi

-- 
OCaml packaging



More information about the Pkg-ocaml-maint-commits mailing list