[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, experimental/master, updated. debian/8.3.pl1+dfsg-1-5-g853081b

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 853081b70ac141ffcbde0cf468b6f45c62f0a964
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 26 17:56:07 2011 +0100

    Set and check COQ_VERSION used to compute COQ_ABI in debian/rules

diff --git a/debian/changelog b/debian/changelog
index d87646b..4c4a839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coq (8.3.pl1+dfsg-2) experimental; urgency=low
+
+  * Set and check COQ_VERSION used to compute COQ_ABI in debian/rules
+
+ -- Stéphane Glondu <glondu at debian.org>  Sat, 26 Feb 2011 18:12:12 +0100
+
 coq (8.3.pl1+dfsg-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 3471198..a4609b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT=
 
 PACKAGES := $(shell dh_listpackages)
 
-COQ_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/~/+/g' -e 's/^Version: \(.*\)-[0-9]\+/\1/p')
+COQ_VERSION := 8.3pl1
 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI)
 
 CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \
@@ -60,6 +60,12 @@ ifeq ($(BUILDCACHE),)
 else
 	rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
 endif
+# Check that $(COQ_VERSION) has the right value
+	ACTUAL_COQ_VERSION="$$(./bin/coqc --version | awk '/version/{print $$6}')"; \
+	if [ "$$ACTUAL_COQ_VERSION" != "$(COQ_VERSION)" ]; then \
+	  echo "Please set COQ_VERSION to $$ACTUAL_COQ_VERSION in debian/rules"; \
+	  exit 2; \
+	fi
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:

-- 
coq packaging