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

[Samuel Mimram]

The following commit has been merged in the master branch:
commit e7cb97400fc75827976a48da0138a551496fe14a
Author: Samuel Mimram <smimram at debian.org>
Date:   Thu Feb 19 13:55:21 2009 +0100

    Added coqvars.mk helper for coq-related packages.

diff --git a/debian/changelog b/debian/changelog
index d2fd875..9bf2652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ coq (8.2-1+dfsg-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Use variables from dh-ocaml in rules.
+  * Added coqvars.mk helper for coq-related packages.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 13:27:14 +0100
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 13:54:38 +0100
 
 coq (8.2~rc2+dfsg-3) experimental; urgency=low
 
diff --git a/debian/coq.dirs.in b/debian/coq.dirs.in
index 7642db5..5c2ef46 100644
--- a/debian/coq.dirs.in
+++ b/debian/coq.dirs.in
@@ -1,5 +1,6 @@
 usr/bin
 usr/lib/coq/contrib/micromega
+usr/share/coq
 usr/share/man/man1
 usr/share/pixmaps
 usr/share/texmf/tex/latex/misc
diff --git a/debian/coqvars.mk b/debian/coqvars.mk
new file mode 100644
index 0000000..3cf8fe0
--- /dev/null
+++ b/debian/coqvars.mk
@@ -0,0 +1,12 @@
+# Current coq version
+COQ_VERSION ?= $(shell /usr/bin/coqc --version | grep version | sed 's/^.*version \(.*\) ([^)]*)$/\1/')
+
+# Current coq ABI
+COQ_ABI ?= $(shell cat /usr/lib/coq/abi)
+
+# Standard library path
+COQ_STDLIB_DIR ?= $(shell /usr/bin/coqc -where)
+
+# Directory for contributions
+# External libraries should go there
+COQ_USERCONTRIB_DIR ?= $(COQ_STDLIB_DIR)/user-contrib
diff --git a/debian/rules b/debian/rules
index eede101..04a75b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,7 @@ install-stamp: build-stamp
 	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 \
 	  echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \

-- 
coq packaging