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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6420ff1374c5bd59465fef7b14b9e8eb514c3f24
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 1 10:39:34 2009 +0200

    Install ssreflect directy in /usr/lib/coq/user-contrib for now

diff --git a/debian/changelog b/debian/changelog
index b7292bb..346aa33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ssreflect (1.2+dfsg-2) UNRELEASED; urgency=low
 
-  * Move ssreflect files out of user-contrib to avoir Coq warnings
+  * Install ssreflect files directly at the root of user-contrib
 
  -- 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 9064eac..7215bb0 100644
--- a/debian/libssreflect-coq.README.Debian
+++ b/debian/libssreflect-coq.README.Debian
@@ -5,20 +5,11 @@ This package doesn't provide the ssrcoq binary as built originally by
 upstream (but relies on dynamic linking instead), nor the PDF
 documentation (which is available online, see README).
 
-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:
+You can use Ssreflect directly with the regular Coq tools. For
+compatibility, a symlink to coqtop named "ssrcoq" is provided.
 
-  -I /usr/lib/coq/ssr
+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.
 
-to command lines (it works with coqide too). A wrapper shell script
-around coqtop, ssrcoq, is provided, and should have the same behaviour
-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/ssr".
-
-to your .v files.
-
- -- Stephane Glondu <steph at glondu.net>, Mon, 31 Aug 2009 13:07:59 +0200
+ -- Stéphane Glondu <glondu at debian.org>, Tue,  1 Sep 2009 10:38:27 +0200
diff --git a/debian/libssreflect-coq.install b/debian/libssreflect-coq.install
index c9de643..c4d7703 100644
--- a/debian/libssreflect-coq.install
+++ b/debian/libssreflect-coq.install
@@ -1,3 +1,2 @@
-debian/ssrcoq     usr/bin
-theories/*.vo     usr/lib/coq/ssr
+theories/*.vo     usr/lib/coq/user-contrib
 html              usr/share/doc/libssreflect-coq
diff --git a/debian/libssreflect-coq.links b/debian/libssreflect-coq.links
new file mode 100644
index 0000000..0040b22
--- /dev/null
+++ b/debian/libssreflect-coq.links
@@ -0,0 +1,2 @@
+usr/bin/coqtop usr/bin/ssrcoq
+usr/share/man/man1/coqtop.1.gz usr/share/man/man1/ssrcoq.1.gz
diff --git a/debian/libssreflect-coq.manpages b/debian/libssreflect-coq.manpages
deleted file mode 100644
index d22e594..0000000
--- a/debian/libssreflect-coq.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/ssrcoq.1
diff --git a/debian/libssreflect-ocaml.install.in b/debian/libssreflect-ocaml.install.in
index 3f093e9..40a9508 100644
--- a/debian/libssreflect-ocaml.install.in
+++ b/debian/libssreflect-ocaml.install.in
@@ -1,2 +1,2 @@
-src/ssreflect.cmo usr/lib/coq/ssr
-OPT: src/ssreflect.cmxs usr/lib/coq/ssr
+src/ssreflect.cmo usr/lib/coq/user-contrib
+OPT: src/ssreflect.cmxs usr/lib/coq/user-contrib
diff --git a/debian/rules b/debian/rules
index fd07db7..bc62f05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ override_dh_auto_build:
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	chmod +x debian/ssrcoq
 
 .PHONY: override_dh_clean
 override_dh_clean: ocamlinit-clean
diff --git a/debian/ssrcoq b/debian/ssrcoq
deleted file mode 100755
index 8426f99..0000000
--- a/debian/ssrcoq
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec coqtop -I /usr/lib/coq/ssr "$@"
diff --git a/debian/ssrcoq.1 b/debian/ssrcoq.1
deleted file mode 100644
index 1085969..0000000
--- a/debian/ssrcoq.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SSREFLECT 1 "August 2009"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-Ssreflect \- small scale reflection extension library for Coq
-.SH SYNOPSIS
-.B ssrcoq
-.RI [ options ]
-.SH DESCRIPTION
-.B ssrcoq
-is a small shellscript wrapper around coqtop that calls it with Ssreflect's include path.
-.PP
-.SH OPTIONS
-This program accepts the same options as coqtop.
-.SH SEE ALSO
-.BR coqtop (1),
-.BR /usr/share/doc/libssreflect-coq/README ,
-.BR /usr/share/doc/libssreflect-coq/README.Debian .
-.SH AUTHOR
-Ssreflect was written by members of the Mathematical Components project
-at the Microsoft Research - INRIA joint center.
-.PP
-This manual page was written by Stéphane Glondu <glondu at debian.org>,
-for the Debian project (and may be used by others).

-- 
ssreflect packaging