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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 099f88d4005c3d8e1546763f85dddf58e941fcaf
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Aug 31 13:10:26 2009 +0200

    Move ssreflect files out of user-contrib to avoir Coq warnings

diff --git a/debian/changelog b/debian/changelog
index 75aec36..b7292bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ssreflect (1.2+dfsg-2) UNRELEASED; urgency=low
+
+  * Move ssreflect files out of user-contrib to avoir Coq warnings
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 31 Aug 2009 13:10:29 +0200
+
 ssreflect (1.2+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #508468)
diff --git a/debian/libssreflect-coq.README.Debian b/debian/libssreflect-coq.README.Debian
index 9f9b6cd..9064eac 100644
--- a/debian/libssreflect-coq.README.Debian
+++ b/debian/libssreflect-coq.README.Debian
@@ -9,7 +9,7 @@ You can directly use Ssreflect with the regular Coq tools. To do so,
 you have to add Ssreflect's path to the loading path, e.g. by
 adding:
 
-  -I /usr/lib/coq/user-contrib/ssr
+  -I /usr/lib/coq/ssr
 
 to command lines (it works with coqide too). A wrapper shell script
 around coqtop, ssrcoq, is provided, and should have the same behaviour
@@ -17,8 +17,8 @@ as the coqmktop-generated ssrcoq as built originally by upstream.
 
 You can also use Ssreflect with regular tools by adding:
 
-  Add LoadPath "/usr/lib/coq/user-contrib/ssr".
+  Add LoadPath "/usr/lib/coq/ssr".
 
 to your .v files.
 
- -- Stephane Glondu <steph at glondu.net>, Wed, 26 Aug 2009 23:31:33 +0200
+ -- Stephane Glondu <steph at glondu.net>, Mon, 31 Aug 2009 13:07:59 +0200
diff --git a/debian/libssreflect-coq.install b/debian/libssreflect-coq.install
index 65cd0c4..c9de643 100644
--- a/debian/libssreflect-coq.install
+++ b/debian/libssreflect-coq.install
@@ -1,3 +1,3 @@
 debian/ssrcoq     usr/bin
-theories/*.vo     usr/lib/coq/user-contrib/ssr
+theories/*.vo     usr/lib/coq/ssr
 html              usr/share/doc/libssreflect-coq
diff --git a/debian/libssreflect-ocaml.install.in b/debian/libssreflect-ocaml.install.in
index 17cc5a5..3f093e9 100644
--- a/debian/libssreflect-ocaml.install.in
+++ b/debian/libssreflect-ocaml.install.in
@@ -1,2 +1,2 @@
-src/ssreflect.cmo usr/lib/coq/user-contrib/ssr
-OPT: src/ssreflect.cmxs usr/lib/coq/user-contrib/ssr
+src/ssreflect.cmo usr/lib/coq/ssr
+OPT: src/ssreflect.cmxs usr/lib/coq/ssr
diff --git a/debian/ssrcoq b/debian/ssrcoq
index e4ebddb..8426f99 100755
--- a/debian/ssrcoq
+++ b/debian/ssrcoq
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec coqtop -I /usr/lib/coq/user-contrib/ssr "$@"
+exec coqtop -I /usr/lib/coq/ssr "$@"

-- 
ssreflect packaging