[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.3pl2-3-2-g65d50eb

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 36b900e3c4f1b62f2c4427d427c4caf061522230
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 1 16:43:24 2012 +0200

    Fix compilation with camlp5 6.05 and coq 8.3pl4

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
new file mode 100644
index 0000000..46eafd3
--- /dev/null
+++ b/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch
@@ -0,0 +1,24 @@
+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 ee8014b..e8726c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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