[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a246a7c0350292f1aa11469ca5b21aea3e7a62e1
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 9 09:27:30 2012 +0200

    Refresh patches

diff --git a/debian/patches/0001-Fix-tests-Make.patch b/debian/patches/0001-Fix-tests-Make.patch
index 08c202f..4859bfa 100644
--- a/debian/patches/0001-Fix-tests-Make.patch
+++ b/debian/patches/0001-Fix-tests-Make.patch
@@ -5,7 +5,7 @@ Subject: Fix tests' Make
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  test/Make |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 diff --git a/test/Make b/test/Make
 index 043d05c..8319f1d 100644
diff --git a/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch b/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch
deleted file mode 100644
index 9213654..0000000
--- a/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Hugo Herbelin <herbelin at 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 <steph at 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/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch b/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch
deleted file mode 100644
index 46eafd3..0000000
--- a/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 1 Apr 2012 16:43:08 +0200
-Subject: Fix compilation with camlp5 6.05 and coq 8.3pl4
-
----
- src/ssreflect.ml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ssreflect.ml b/src/ssreflect.ml
-index 357cf57..e1b4215 100644
---- a/src/ssreflect.ml
-+++ b/src/ssreflect.ml
-@@ -2683,8 +2683,8 @@ let tclDO n tac =
-     try tac gl
-     with 
-     | UserError (l, s) -> raise (UserError (l, prefix i ++ s))
--    | Stdpp.Exc_located(loc, UserError (l, s))  -> 
--        raise (Stdpp.Exc_located(loc, UserError (l, prefix i ++ s))) in
-+    | Compat.Exc_located(loc, UserError (l, s))  ->
-+        raise (Compat.Exc_located(loc, UserError (l, prefix i ++ s))) in
-   let rec loop i gl =
-     if i = n then tac_err_at i gl else
-     (tclTHEN (tac_err_at i) (loop (i + 1))) gl in
--- 
diff --git a/debian/patches/series b/debian/patches/series
index e8726c8..f38427a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Fix-tests-Make.patch
-0002-Activated-option-Automatic-Coercions-Import.patch
-0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch

-- 
ssreflect packaging