[Pkg-ocaml-maint-commits] [SCM] matita packaging branch, master, updated. debian/0.5.8-3-2-gee3cc44

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8f84b05d3677f8dfe3dd624e6a798b26af14c9fa
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Mar 12 12:52:45 2012 +0100

    Fix FTBFS with camlp5 6.05

diff --git a/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch b/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch
new file mode 100644
index 0000000..98855ad
--- /dev/null
+++ b/debian/patches/Fix-FTBFS-with-camlp5-6.05.patch
@@ -0,0 +1,55 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 12 Mar 2012 12:51:48 +0100
+Subject: Fix FTBFS with camlp5 6.05
+
+Replace Stdpp.Exc_located (which has been obsolete for a while) by
+Ploc.Exc.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ components/content_pres/cicNotationParser.ml |    6 +++---
+ components/grafite_parser/grafiteParser.ml   |    8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/components/content_pres/cicNotationParser.ml b/components/content_pres/cicNotationParser.ml
+index 5725dfb..8b5f1ed 100644
+--- a/components/content_pres/cicNotationParser.ml
++++ b/components/content_pres/cicNotationParser.ml
+@@ -814,11 +814,11 @@ let exc_located_wrapper f =
+   try
+     f ()
+   with
+-  | Stdpp.Exc_located (floc, Stream.Error msg) ->
++  | Ploc.Exc (floc, Stream.Error msg) ->
+       raise (HExtlib.Localized (floc, Parse_error msg))
+-  | Stdpp.Exc_located (floc, HExtlib.Localized (_,exn)) ->
++  | Ploc.Exc (floc, HExtlib.Localized (_,exn)) ->
+       raise (HExtlib.Localized (floc, (Parse_error (Printexc.to_string exn))))
+-  | Stdpp.Exc_located (floc, exn) ->
++  | Ploc.Exc (floc, exn) ->
+       raise (HExtlib.Localized (floc, (Parse_error (Printexc.to_string exn))))
+ 
+ let parse_level1_pattern precedence lexbuf =
+diff --git a/components/grafite_parser/grafiteParser.ml b/components/grafite_parser/grafiteParser.ml
+index 2a7405a..9506043 100644
+--- a/components/grafite_parser/grafiteParser.ml
++++ b/components/grafite_parser/grafiteParser.ml
+@@ -1005,13 +1005,13 @@ let exc_located_wrapper f =
+   try
+     f ()
+   with
+-  | Stdpp.Exc_located (_, End_of_file) -> raise End_of_file
+-  | Stdpp.Exc_located (floc, Stream.Error msg) ->
++  | Ploc.Exc (_, End_of_file) -> raise End_of_file
++  | Ploc.Exc (floc, Stream.Error msg) ->
+       raise (HExtlib.Localized (floc,CicNotationParser.Parse_error msg))
+-  | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) ->
++  | Ploc.Exc (floc, HExtlib.Localized(_,exn)) ->
+       raise
+        (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
+-  | Stdpp.Exc_located (floc, exn) ->
++  | Ploc.Exc (floc, exn) ->
+       raise
+        (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 52d7f55..07eff40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ matita.conf.xml.in.patch
 numbers.patch
 native-compilers.patch
 slist-sep.patch
+Fix-FTBFS-with-camlp5-6.05.patch

-- 
matita packaging