The following commit has been merged in the master branch: commit 2ad45925a28300da516ac68ea99d5d585771b67c Author: Stephane Glondu <st...@glondu.net> Date: Sun Dec 25 17:18:01 2011 +0100
Cherry-pick patch from coq-contrib to fix FTBFS with Coq 8.3pl3 diff --git a/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch b/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch new file mode 100644 index 0000000..9213654 --- /dev/null +++ b/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch @@ -0,0 +1,30 @@ +From: Hugo Herbelin <herbe...@inria.fr> +Date: Fri, 9 Dec 2011 11:16:43 +0000 +Subject: Activated option "Automatic Coercions Import" + +Activated option "Automatic Coercions Import" so that +ReleasedSsreflect compile after Coq v8.3 revision 14776 fixed +unexpected import of coercions in innermost modules of a chain of +nested module when only outermost module is imported. + +This patch fixes FTBFS with Coq 8.3pl3. + +Origin: https://gforge.inria.fr/scm/viewvc.php?view=rev&root=coq-contribs&revision=1697 +Signed-off-by: Stephane Glondu <st...@glondu.net> +--- + theories/ssreflect.v | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/theories/ssreflect.v b/theories/ssreflect.v +index 5b3c345..44981c6 100644 +--- a/theories/ssreflect.v ++++ b/theories/ssreflect.v +@@ -3,6 +3,7 @@ + Require Import Bool. (* For bool_scope delimiter 'bool'. *) + + Declare ML Module "ssreflect". ++Global Set Automatic Coercions Import. + + (***************************************************************************) + (* This file is the Gallina part of the ssreflect plugin implementation. *) +-- diff --git a/debian/patches/series b/debian/patches/series index f38427a..ee8014b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-tests-Make.patch +0002-Activated-option-Automatic-Coercions-Import.patch -- ssreflect packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits