[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.rc2+dfsg-3-15-g9603746

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0a402bcc74943503556478c1e2dc924f27d2a3d3
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Feb 20 13:22:06 2009 +0100

    Generate coqvars.mk from debian/rules and drop /usr/lib/coq/abi

diff --git a/debian/coqvars.mk b/debian/coqvars.mk.in
similarity index 61%
rename from debian/coqvars.mk
rename to debian/coqvars.mk.in
index 3cf8fe0..efbbd24 100644
--- a/debian/coqvars.mk
+++ b/debian/coqvars.mk.in
@@ -1,8 +1,8 @@
 # Current coq version
-COQ_VERSION ?= $(shell /usr/bin/coqc --version | grep version | sed 's/^.*version \(.*\) ([^)]*)$/\1/')
+COQ_VERSION ?= @CoqVersion@
 
 # Current coq ABI
-COQ_ABI ?= $(shell cat /usr/lib/coq/abi)
+COQ_ABI ?= @CoqABI@
 
 # Standard library path
 COQ_STDLIB_DIR ?= $(shell /usr/bin/coqc -where)
diff --git a/debian/rules b/debian/rules
index 6d55d2c..2943187 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,10 @@ CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \
   --browser "/usr/bin/x-www-browser %s &" \
   --with-doc no --coqrunbyteflags "-dllib -lcoqrun"
 
+OCAMLINIT_SED += \
+  -e 's%@CoqVersion@%$(COQ_VERSION)%' \
+  -e 's%@CoqABI@%$(COQ_ABI)%'
+
 configure: configure-stamp
 configure-stamp: patch-stamp ocamlinit-stamp
 	dh build --before dh_auto_configure
@@ -65,7 +69,6 @@ install-stamp: build-stamp
 	cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
 	cp debian/coqide.desktop debian/coqide/usr/share/applications
 	cp -r doc/stdlib/html debian/coq-theories/usr/share/doc/coq-theories/
-	echo "$(COQ_ABI)" > debian/coq/usr/lib/coq/abi
 	cp debian/coqvars.mk debian/coq/usr/share/coq/
 	dh install --after dh_install
 	for u in $(PACKAGES); do \

-- 
coq packaging