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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 03d1210b3f3f61d62801c8671a0c007ab7e4911d
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 31 11:07:20 2011 +0200

    Port to current OCaml/CamlP5 (Closes: #612891)

diff --git a/debian/patches/00list b/debian/patches/00list
index e695cdf..e190646 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 matita.conf.xml.in.dpatch
 numbers.dpatch
 native-compilers.dpatch
+slist-sep.dpatch
diff --git a/debian/patches/slist-sep.dpatch b/debian/patches/slist-sep.dpatch
new file mode 100755
index 0000000..095d38f
--- /dev/null
+++ b/debian/patches/slist-sep.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## slist-sep.dpatch by Colin Watson <cjwatson at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Port to current OCaml/CamlP5.  r11210 from upstream SVN.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' matita~/components/content_pres/cicNotationParser.ml matita/components/content_pres/cicNotationParser.ml
+--- matita~/components/content_pres/cicNotationParser.ml	2009-09-21 11:01:28.000000000 +0100
++++ matita/components/content_pres/cicNotationParser.ml	2011-05-21 09:18:45.000000000 +0100
+@@ -211,8 +211,8 @@
+           match magic with
+           | Ast.List0 (_, None) -> Gramext.Slist0 s
+           | Ast.List1 (_, None) -> Gramext.Slist1 s
+-          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l)
+-          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l)
++          | Ast.List0 (_, Some l) -> Gramext.Slist0sep (s, gram_of_literal l,false)
++          | Ast.List1 (_, Some l) -> Gramext.Slist1sep (s, gram_of_literal l,false)
+           | _ -> assert false
+         in
+         [ Env (List.map Env.list_declaration p_names),
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' matita~/components/grafite_parser/print_grammar.ml matita/components/grafite_parser/print_grammar.ml
+--- matita~/components/grafite_parser/print_grammar.ml	2009-05-25 16:39:26.000000000 +0100
++++ matita/components/grafite_parser/print_grammar.ml	2011-05-21 09:18:05.000000000 +0100
+@@ -87,7 +87,7 @@
+   | Smeta (_, lt, _) -> List.for_all is_symbol_dummy lt
+   | Snterm e | Snterml (e, _) -> is_entry_dummy e
+   | Slist1 x | Slist0 x -> is_symbol_dummy x
+-  | Slist1sep (x,y) | Slist0sep (x,y) -> is_symbol_dummy x && is_symbol_dummy y
++  | Slist1sep (x,y,false) | Slist0sep (x,y,false) -> is_symbol_dummy x && is_symbol_dummy y
+   | Sopt x -> is_symbol_dummy x
+   | Sself | Snext -> false
+   | Stree t -> is_tree_dummy t
+@@ -186,7 +186,7 @@
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "@]} @ ";
+         todo
+-    | Slist0sep (symbol,sep) ->
++    | Slist0sep (symbol,sep,false) ->
+         Format.fprintf fmt "[@[<hov2> ";
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "{@[<hov2> ";
+@@ -200,7 +200,7 @@
+         let todo = visit_symbol symbol todo is_son in
+         Format.fprintf fmt "@]}+ @ ";
+         todo 
+-    | Slist1sep (symbol,sep) ->
++    | Slist1sep (symbol,sep,false) ->
+         let todo = visit_symbol symbol todo is_son  in
+         Format.fprintf fmt "{@[<hov2> ";
+         let todo = visit_symbol sep todo is_son in

-- 
matita packaging