[Pkg-ocaml-maint-commits] r2091 - in trunk/packages/coq/trunk/debian: . patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-21 19:43:47 +0000 (Mon, 21 Nov 2005)
New Revision: 2091

Added:
   trunk/packages/coq/trunk/debian/patches/ocaml309.dpatch
Modified:
   trunk/packages/coq/trunk/debian/changelog
   trunk/packages/coq/trunk/debian/control
   trunk/packages/coq/trunk/debian/patches/00list
Log:
Updated to OCaml 3.09.0.

Modified: trunk/packages/coq/trunk/debian/changelog
===================================================================
--- trunk/packages/coq/trunk/debian/changelog	2005-11-20 20:42:24 UTC (rev 2090)
+++ trunk/packages/coq/trunk/debian/changelog	2005-11-21 19:43:47 UTC (rev 2091)
@@ -1,3 +1,12 @@
+coq (8.0pl2-4) unstable; urgency=low
+
+  * Added ocaml309.dpatch patch to compile cleanly with OCaml 3.09,
+    closes: #340185.
+  * Removed recommends on coq-doc which is not in main anymore.
+  * Updated standards version to 3.6.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 21 Nov 2005 19:52:53 +0100
+
 coq (8.0pl2-3) unstable; urgency=low
 
   * Added text_view_typing_error patch to avoid a typing error and solve the

Modified: trunk/packages/coq/trunk/debian/control
===================================================================
--- trunk/packages/coq/trunk/debian/control	2005-11-20 20:42:24 UTC (rev 2090)
+++ trunk/packages/coq/trunk/debian/control	2005-11-21 19:43:47 UTC (rev 2091)
@@ -3,13 +3,13 @@
 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.1.1
-Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.08.2), ocaml-best-compilers, liblablgtk2-ocaml-dev (>= 2.4.0)
+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)
 
 Package: coq
 Architecture: any
 Depends: ${shlibs:Depends}, coq-libs (= ${Source-Version})
-Recommends: coq-doc, coqide | proofgeneral-coq
+Recommends: coqide | proofgeneral-coq
 Suggests: ocaml-nox (>= 3.08), proofgeneral-coq, ledit, cle
 Description: proof assistant for higher-order logic (toplevel and compiler)
  Coq is a proof assistant for higher-order logic, which allows the

Modified: trunk/packages/coq/trunk/debian/patches/00list
===================================================================
--- trunk/packages/coq/trunk/debian/patches/00list	2005-11-20 20:42:24 UTC (rev 2090)
+++ trunk/packages/coq/trunk/debian/patches/00list	2005-11-21 19:43:47 UTC (rev 2091)
@@ -1 +1,2 @@
+ocaml309
 text_view_typing_error

Added: trunk/packages/coq/trunk/debian/patches/ocaml309.dpatch
===================================================================
--- trunk/packages/coq/trunk/debian/patches/ocaml309.dpatch	2005-11-20 20:42:24 UTC (rev 2090)
+++ trunk/packages/coq/trunk/debian/patches/ocaml309.dpatch	2005-11-21 19:43:47 UTC (rev 2091)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocaml309.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct a compilation issue with OCaml 3.09.
+
+ at DPATCH@
+diff -urNad coq-8.0pl2~/Makefile coq-8.0pl2/Makefile
+--- coq-8.0pl2~/Makefile	2005-01-21 18:15:12.000000000 +0100
++++ coq-8.0pl2/Makefile	2005-11-21 19:51:38.000000000 +0100
+@@ -1453,11 +1453,11 @@
+ 
+ .ml4.cmx:
+ 	$(SHOW)'OCAMLOPT4 $<'
+-	$(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $<
++	$(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $<
+ 
+ .ml4.cmo:
+ 	$(SHOW)'OCAMLC4   $<'
+-	$(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $<
++	$(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -loc loc -impl" -c -impl $<
+ 
+ #.v.vo:
+ #	$(BOOTCOQTOP) -compile $*


Property changes on: trunk/packages/coq/trunk/debian/patches/ocaml309.dpatch
___________________________________________________________________
Name: svn:executable
   + *