[Pkg-ocaml-maint-commits] r2841 - in /trunk/packages/coq/branches:
8.0pl3+8.1alpha/ 8.1/ 8.1/debian/ 8.1/debian/patches/ upstream/
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Fri Jun 16 14:41:57 UTC 2006
Author: smimram
Date: Fri Jun 16 14:41:51 2006
New Revision: 2841
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2841
Log:
New upstream release.
Added:
trunk/packages/coq/branches/8.1/
- copied from r2840, trunk/packages/coq/branches/8.0pl3+8.1alpha/
trunk/packages/coq/branches/upstream/coq_8.0pl3+8.1beta.orig.tar.gz (with props)
Removed:
trunk/packages/coq/branches/8.0pl3+8.1alpha/
trunk/packages/coq/branches/8.1/debian/patches/failing_tests.dpatch
trunk/packages/coq/branches/upstream/coq_8.0pl3+8.1alpha.orig.tar.gz
Modified:
trunk/packages/coq/branches/8.1/debian/changelog
trunk/packages/coq/branches/8.1/debian/control
trunk/packages/coq/branches/8.1/debian/patches/00list
trunk/packages/coq/branches/8.1/debian/patches/coqdoc_stdlib.dpatch
trunk/packages/coq/branches/8.1/debian/rules
Modified: trunk/packages/coq/branches/8.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/changelog?rev=2841&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/changelog (original)
+++ trunk/packages/coq/branches/8.1/debian/changelog Fri Jun 16 14:41:51 2006
@@ -1,3 +1,14 @@
+coq (8.0pl3+8.1beta-1) experimental; urgency=low
+
+ * New upstream release.
+ * Added --fsets all option to configure to build the theory of finite sets.
+ * Updated coqdoc_stdlib.dpatch, partly integrated upstream.
+ * Removed failing_tests.dpath, all the tests should succeed now.
+ * We don't need to remove rpaths anymore.
+ * Updated standards version to 3.7.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org> Fri, 16 Jun 2006 12:59:07 +0000
+
coq (8.0pl3+8.1alpha-2) experimental; urgency=low
* Added makefile.dpatch in order for ocamlopt not to be called when
Modified: trunk/packages/coq/branches/8.1/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/control?rev=2841&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/control (original)
+++ trunk/packages/coq/branches/8.1/debian/control Fri Jun 16 14:41:51 2006
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>
-Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09.0), ocaml-best-compilers, liblablgtk2-ocaml-dev (>= 2.4.0), chrpath
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09.0), ocaml-best-compilers, liblablgtk2-ocaml-dev (>= 2.4.0), tetex-extra, hevea
Package: coq
Architecture: any
Modified: trunk/packages/coq/branches/8.1/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/00list?rev=2841&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/00list (original)
+++ trunk/packages/coq/branches/8.1/debian/patches/00list Fri Jun 16 14:41:51 2006
@@ -1,4 +1,3 @@
coqdoc_stdlib
-failing_tests
browser
makefile
Modified: trunk/packages/coq/branches/8.1/debian/patches/coqdoc_stdlib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/patches/coqdoc_stdlib.dpatch?rev=2841&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/patches/coqdoc_stdlib.dpatch (original)
+++ trunk/packages/coq/branches/8.1/debian/patches/coqdoc_stdlib.dpatch Fri Jun 16 14:41:51 2006
@@ -6,9 +6,9 @@
## DP: to be able to build the documentation before coqdoc is installed.
@DPATCH@
-diff -urNad coq-8.0pl3+8.1alpha~/doc/Makefile coq-8.0pl3+8.1alpha/doc/Makefile
---- coq-8.0pl3+8.1alpha~/doc/Makefile 2006-04-07 15:08:12.000000000 +0000
-+++ coq-8.0pl3+8.1alpha/doc/Makefile 2006-04-28 13:43:28.000000000 +0000
+diff -urNad coq-8.0pl3+8.1beta~/doc/Makefile coq-8.0pl3+8.1beta/doc/Makefile
+--- coq-8.0pl3+8.1beta~/doc/Makefile 2006-06-16 13:02:33.000000000 +0000
++++ coq-8.0pl3+8.1beta/doc/Makefile 2006-06-16 13:19:11.000000000 +0000
@@ -216,6 +216,7 @@
mkdir stdlib/html
(cd stdlib/html;\
@@ -17,57 +17,3 @@
-R $(COQTOP)/theories Coq $(COQTOP)/theories/*/*.v)
mv stdlib/html/index.html stdlib/index-body.html
-@@ -232,6 +233,7 @@
- stdlib/Library.coqdoc.tex:
- (for dir in $(LIBDIRS) ; do \
- $(COQDOC) -q --gallina --body-only --latex --stdout \
-+ --coqlib_path $(COQTOP) \
- -R $(COQTOP)/theories Coq "$(COQTOP)/theories/$$dir/"*.v >> $@ ; done)
-
- stdlib/Library.dvi: $(COMMON) stdlib/Library.coqdoc.tex stdlib/Library.tex
-diff -urNad coq-8.0pl3+8.1alpha~/tools/coqdoc/cdglobals.ml coq-8.0pl3+8.1alpha/tools/coqdoc/cdglobals.ml
---- coq-8.0pl3+8.1alpha~/tools/coqdoc/cdglobals.ml 2006-03-08 10:47:12.000000000 +0000
-+++ coq-8.0pl3+8.1alpha/tools/coqdoc/cdglobals.ml 2006-04-28 13:41:09.000000000 +0000
-@@ -44,6 +44,7 @@
- let title = ref ""
- let externals = ref true
- let coqlib = ref "http://coq.inria.fr/library/"
-+let coqlib_path = ref Coq_config.coqlib
- let raw_comments = ref false
-
- let charset = ref "iso-8859-1"
-diff -urNad coq-8.0pl3+8.1alpha~/tools/coqdoc/main.ml coq-8.0pl3+8.1alpha/tools/coqdoc/main.ml
---- coq-8.0pl3+8.1alpha~/tools/coqdoc/main.ml 2006-03-28 17:34:15.000000000 +0000
-+++ coq-8.0pl3+8.1alpha/tools/coqdoc/main.ml 2006-04-28 13:41:09.000000000 +0000
-@@ -54,6 +54,8 @@
- prerr_endline " --no-externals no links to Coq standard library";
- prerr_endline " --coqlib <url> set URL for Coq standard library";
- prerr_endline " (default is http://coq.inria.fr/library/)";
-+ prerr_endline " --coqlib_path <dir> path of the coqlibrary";
-+ prerr_endline (" (default is " ^ !Cdglobals.coqlib_path ^ ")");
- prerr_endline " -R <dir> <coqdir> map physical dir to Coq dir";
- prerr_endline " --latin1 set ISO-8859-1 input language";
- prerr_endline " --utf8 set UTF-8 input language";
-@@ -315,6 +317,8 @@
- Cdglobals.externals := false; parse_rec rem
- | ("--coqlib" | "-coqlib") :: u :: rem ->
- Cdglobals.coqlib := u; parse_rec rem
-+ | ("--coqlib_path" | "-coqlib_path") :: u :: rem ->
-+ Cdglobals.coqlib_path := u; parse_rec rem
- | ("--coqlib" | "-coqlib") :: [] ->
- usage ()
- | f :: rem ->
-@@ -420,11 +424,11 @@
- let produce_document l =
- List.iter index_module l;
- (if !target_language=HTML then
-- let src = (Filename.concat Coq_config.coqlib "/tools/coqdoc/coqdoc.css") in
-+ let src = (Filename.concat !Cdglobals.coqlib_path "/tools/coqdoc/coqdoc.css") in
- let dst = if !output_dir <> "" then Filename.concat !output_dir "coqdoc.css" else "coqdoc.css" in
- copy src dst);
- (if !target_language=LaTeX then
-- let src = (Filename.concat Coq_config.coqlib "/tools/coqdoc/coqdoc.sty") in
-+ let src = (Filename.concat !Cdglobals.coqlib_path "/tools/coqdoc/coqdoc.sty") in
- let dst = if !output_dir <> "" then
- Filename.concat !output_dir "coqdoc.sty"
- else "coqdoc.sty" in
Modified: trunk/packages/coq/branches/8.1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.1/debian/rules?rev=2841&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.1/debian/rules (original)
+++ trunk/packages/coq/branches/8.1/debian/rules Fri Jun 16 14:41:51 2006
@@ -13,7 +13,7 @@
COQPREF := $(CURDIR)/debian/tmp
ADDPREF := COQINSTALLPREFIX=$(COQPREF)
-CONFIGUREOPTS := --prefix /usr --mandir /usr/share/man --emacslib /usr/share/emacs/site-lisp/coq --reals all
+CONFIGUREOPTS := --prefix /usr --mandir /usr/share/man --emacslib /usr/share/emacs/site-lisp/coq --reals all --fsets all
configure: configure-stamp
configure-stamp:
@@ -78,11 +78,10 @@
echo "Stripping: $$i"; \
strip -R .note -R .comment $$i; \
done
- -for i in $(COQPREF)/usr/bin/coqide.*; do \
- echo "Rpath for `chrpath $$i`"; \
- echo "Removing rpath: $$i"; \
- chrpath -d $$i; \
- done
+ if [ -e opt-stamp ]; then \
+ strip -R .note -R .comment $ $(COQPREF)/usr/bin/coqc; \
+ strip -R .note -R .comment $(COQPREF)/usr/bin/coqmktop; \
+ fi
cp debian/coq.xpm debian/coq/usr/share/pixmaps/coq.xpm
cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm
cp debian/coqide.desktop debian/coqide/usr/share/applications
Added: trunk/packages/coq/branches/upstream/coq_8.0pl3+8.1beta.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/upstream/coq_8.0pl3%2B8.1beta.orig.tar.gz?rev=2841&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/coq/branches/upstream/coq_8.0pl3+8.1beta.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list