[Pkg-ocaml-maint-commits] r4630 - in /trunk/packages/coq: trunk/debian/ trunk/debian/patches/ upstream/
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Mon Oct 15 19:55:12 UTC 2007
Author: smimram
Date: Mon Oct 15 19:55:12 2007
New Revision: 4630
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4630
Log:
New upstream release.
Added:
trunk/packages/coq/upstream/coq_8.1.pl2+dfsg.orig.tar.gz (with props)
Removed:
trunk/packages/coq/trunk/debian/patches/camlp5.dpatch
trunk/packages/coq/upstream/coq_8.1.pl1+dfsg.orig.tar.gz
Modified:
trunk/packages/coq/trunk/debian/changelog
trunk/packages/coq/trunk/debian/control
trunk/packages/coq/trunk/debian/patches/00list
trunk/packages/coq/trunk/debian/patches/browser.dpatch
trunk/packages/coq/trunk/debian/patches/coqdoc_stdlib.dpatch
trunk/packages/coq/trunk/debian/patches/makefile.dpatch
Modified: trunk/packages/coq/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/changelog?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/changelog (original)
+++ trunk/packages/coq/trunk/debian/changelog Mon Oct 15 19:55:12 2007
@@ -1,8 +1,12 @@
-coq (8.1.pl1+dfsg-4) UNRELEASED; urgency=low
-
+coq (8.1.pl2+dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * Removed camlp5.dpatch, integrated upstream.
+ * Updated browser.dpatch, coqdoc_stdlib.dpatch and makefile.dpatch.
* Corrected emacs-mode startup file, closes: #446170.
-
- -- Samuel Mimram <smimram at debian.org> Wed, 10 Oct 2007 22:36:07 +0000
+ * Removed Sven Luther from uploaders.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 15 Oct 2007 18:55:09 +0000
coq (8.1.pl1+dfsg-3) unstable; urgency=low
Modified: trunk/packages/coq/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/control?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/control (original)
+++ trunk/packages/coq/trunk/debian/control Mon Oct 15 19:55:12 2007
@@ -2,7 +2,7 @@
Section: math
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>
+Uploaders: Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), dpatch, ocaml-nox (>= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (>= 2.4.0), texlive-latex-extra, hevea
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/coq
Modified: trunk/packages/coq/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/00list?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/patches/00list (original)
+++ trunk/packages/coq/trunk/debian/patches/00list Mon Oct 15 19:55:12 2007
@@ -1,4 +1,3 @@
-camlp5
coqdoc_stdlib
browser
makefile
Modified: trunk/packages/coq/trunk/debian/patches/browser.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/browser.dpatch?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/patches/browser.dpatch (original)
+++ trunk/packages/coq/trunk/debian/patches/browser.dpatch Mon Oct 15 19:55:12 2007
@@ -5,15 +5,15 @@
## DP: Use the default Debian browser for help.
@DPATCH@
-diff -urNad coq-8.0pl3+8.1alpha~/lib/options.ml coq-8.0pl3+8.1alpha/lib/options.ml
---- coq-8.0pl3+8.1alpha~/lib/options.ml 2005-12-26 20:07:21.000000000 +0000
-+++ coq-8.0pl3+8.1alpha/lib/options.ml 2006-04-29 16:06:20.000000000 +0000
-@@ -117,7 +117,4 @@
+diff -urNad coq-8.1.pl2+dfsg~/lib/options.ml coq-8.1.pl2+dfsg/lib/options.ml
+--- coq-8.1.pl2+dfsg~/lib/options.ml 2007-10-15 11:00:52.000000000 +0000
++++ coq-8.1.pl2+dfsg/lib/options.ml 2007-10-15 11:01:51.000000000 +0000
+@@ -118,7 +118,4 @@
"\" must contain exactly one placeholder \"%s\".")
else pre,post
with
- Not_found ->
- if Sys.os_type = "Win32"
- then "C:\\PROGRA~1\\INTERN~1\\IEXPLORE ", ""
-- else "netscape -remote \"OpenURL(", ")\""
+- else "firefox -remote \"OpenURL(", ")\""
+ Not_found -> "/usr/bin/x-www-browser ", ""
Modified: trunk/packages/coq/trunk/debian/patches/coqdoc_stdlib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/coqdoc_stdlib.dpatch?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/patches/coqdoc_stdlib.dpatch (original)
+++ trunk/packages/coq/trunk/debian/patches/coqdoc_stdlib.dpatch Mon Oct 15 19:55:12 2007
@@ -6,14 +6,14 @@
## DP: to be able to build the documentation before coqdoc is installed.
@DPATCH@
-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 @@
+diff -urNad coq-8.1.pl2+dfsg~/doc/Makefile coq-8.1.pl2+dfsg/doc/Makefile
+--- coq-8.1.pl2+dfsg~/doc/Makefile 2007-10-15 11:45:13.000000000 +0000
++++ coq-8.1.pl2+dfsg/doc/Makefile 2007-10-15 11:45:40.000000000 +0000
+@@ -222,6 +222,7 @@
mkdir stdlib/html
(cd stdlib/html;\
$(COQDOC) -q --multi-index --html --glob-from $(GLOBDUMP)\
-+ --coqlib_path $(COQTOP) \
- -R $(COQTOP)/theories Coq $(COQTOP)/theories/*/*.v)
++ --coqlib_path $(COQSRC) \
+ -R $(COQSRC)/theories Coq $(COQSRC)/theories/*/*.v)
mv stdlib/html/index.html stdlib/index-body.html
Modified: trunk/packages/coq/trunk/debian/patches/makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/debian/patches/makefile.dpatch?rev=4630&op=diff
==============================================================================
--- trunk/packages/coq/trunk/debian/patches/makefile.dpatch (original)
+++ trunk/packages/coq/trunk/debian/patches/makefile.dpatch Mon Oct 15 19:55:12 2007
@@ -6,15 +6,15 @@
## DP: when compiling on non-native archs.
@DPATCH@
-diff -urNad coq-8.0pl3+8.1alpha~/Makefile coq-8.0pl3+8.1alpha/Makefile
---- coq-8.0pl3+8.1alpha~/Makefile 2006-04-07 15:08:12.000000000 +0000
-+++ coq-8.0pl3+8.1alpha/Makefile 2006-04-30 11:41:09.000000000 +0000
-@@ -1401,7 +1401,7 @@
+diff -urNad coq-8.1.pl2+dfsg~/Makefile coq-8.1.pl2+dfsg/Makefile
+--- coq-8.1.pl2+dfsg~/Makefile 2007-10-15 11:02:54.000000000 +0000
++++ coq-8.1.pl2+dfsg/Makefile 2007-10-15 11:03:55.000000000 +0000
+@@ -1479,7 +1479,7 @@
parsing/grammar.cma: $(GRAMMARCMO)
$(SHOW)'Testing $@'
@touch test.ml4
-- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
-+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
+- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
++ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
@rm -f test-grammar test.*
$(SHOW)'OCAMLC -a $@'
$(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@
Added: trunk/packages/coq/upstream/coq_8.1.pl2+dfsg.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/upstream/coq_8.1.pl2%2Bdfsg.orig.tar.gz?rev=4630&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/coq/upstream/coq_8.1.pl2+dfsg.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list