[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.2+dfsg-1-3-ga2a5fc4

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a2a5fc4e28e894163135dddb02acba023c36dc99
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 1 13:27:02 2009 +0200

    Invoke coq_makefile with -R to avoid mess with user-contrib

diff --git a/debian/changelog b/debian/changelog
index 346aa33..231197b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ssreflect (1.2+dfsg-2) UNRELEASED; urgency=low
 
-  * Install ssreflect files directly at the root of user-contrib
+  * Use -R when invoking coq_makefile to avoid warnings and need of
+    explicit exclusion of ssreflect path
 
  -- Stéphane Glondu <glondu at debian.org>  Mon, 31 Aug 2009 13:10:29 +0200
 
diff --git a/debian/libssreflect-coq.README.Debian b/debian/libssreflect-coq.README.Debian
index 7215bb0..224010c 100644
--- a/debian/libssreflect-coq.README.Debian
+++ b/debian/libssreflect-coq.README.Debian
@@ -8,8 +8,4 @@ documentation (which is available online, see README).
 You can use Ssreflect directly with the regular Coq tools. For
 compatibility, a symlink to coqtop named "ssrcoq" is provided.
 
-Currently, Ssreflect's files are in /usr/lib/coq/user-contrib, and are
-therefore in the default search path. This might change in the
-future.
-
- -- Stéphane Glondu <glondu at debian.org>, Tue,  1 Sep 2009 10:38:27 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Tue,  1 Sep 2009 15:08:28 +0200
diff --git a/debian/libssreflect-coq.install b/debian/libssreflect-coq.install
index c4d7703..1d33bc7 100644
--- a/debian/libssreflect-coq.install
+++ b/debian/libssreflect-coq.install
@@ -1,2 +1,2 @@
-theories/*.vo     usr/lib/coq/user-contrib
+theories/*.vo     usr/lib/coq/user-contrib/ssreflect
 html              usr/share/doc/libssreflect-coq
diff --git a/debian/libssreflect-ocaml.install.in b/debian/libssreflect-ocaml.install.in
index 40a9508..1db3f03 100644
--- a/debian/libssreflect-ocaml.install.in
+++ b/debian/libssreflect-ocaml.install.in
@@ -1,2 +1,3 @@
-src/ssreflect.cmo usr/lib/coq/user-contrib
-OPT: src/ssreflect.cmxs usr/lib/coq/user-contrib
+src/ssreflect.cmi usr/lib/coq/user-contrib/ssreflect
+src/ssreflect.cmo usr/lib/coq/user-contrib/ssreflect
+OPT: src/ssreflect.cmxs usr/lib/coq/user-contrib/ssreflect
diff --git a/debian/rules b/debian/rules
index bc62f05..ba88e64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,12 @@ export COQBIN := /usr/bin/
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure: ocamlinit-stamp
-	coq_makefile -f Make -o Makefile
+	coq_makefile -f Make -o Makefile -R src ssreflect -R theories ssreflect
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 	$(MAKE) all
-	mkdir -p html && cd theories && coqdoc -toc -html -d ../html *.v
+	$(MAKE) html
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:

-- 
ssreflect packaging