[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-6-12-gd87eb43

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 49d17a3d12f75580b24066ca426cc8baf9969030
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 18 21:54:22 2010 +0200

    Add 0005-Fix-some-typos.patch

diff --git a/debian/patches/0005-Fix-some-typos.patch b/debian/patches/0005-Fix-some-typos.patch
new file mode 100644
index 0000000..6043687
--- /dev/null
+++ b/debian/patches/0005-Fix-some-typos.patch
@@ -0,0 +1,46 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 18 May 2010 21:44:10 +0200
+Subject: [PATCH] Fix some typos
+
+Submitted upstream.
+---
+ lexing/lexing_util.ml              |    2 +-
+ optimization/optimization_judge.ml |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lexing/lexing_util.ml b/lexing/lexing_util.ml
+index 806b94b..0b6f996 100644
+--- a/lexing/lexing_util.ml
++++ b/lexing/lexing_util.ml
+@@ -341,7 +341,7 @@ let resolve_axis =
+     (* full axis feature -- Philippe *)
+     | "following" -> Following
+     | "preceding" -> Preceding
+-    | s -> raise (Query (Parsing (Finfo.parsing_locinfo (),"Unkown XQuery axis " ^ s)))
++    | s -> raise (Query (Parsing (Finfo.parsing_locinfo (),"Unknown XQuery axis " ^ s)))
+ 
+ (* The following axis are not in XQuery - Jerome
+     | "namespace" -> Namespace
+diff --git a/optimization/optimization_judge.ml b/optimization/optimization_judge.ml
+index 38de03a..d9ddfb1 100644
+--- a/optimization/optimization_judge.ml
++++ b/optimization/optimization_judge.ml
+@@ -44,7 +44,7 @@ let debug_returned_fields fields =
+   if Debug.join_debug()
+   then
+     begin
+-      Debug.print_join_debug "\t---> Independant branch returned fields:";
++      Debug.print_join_debug "\t---> Independent branch returned fields:";
+       List.iter (fun x -> Debug.print_join_debug ("\t\t" ^ Namespace_names.prefixed_string_of_rqname x)) fields;
+     end
+ 
+@@ -52,7 +52,7 @@ let debug_accessed_fields fields =
+   if Debug.join_debug()
+   then
+     begin
+-      Debug.print_join_debug "\t---> Dependant branch accessed fields:";
++      Debug.print_join_debug "\t---> Dependent branch accessed fields:";
+       List.iter (fun x -> Debug.print_join_debug ("\t\t" ^ Namespace_names.prefixed_string_of_rqname x)) fields;
+     end
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3050c13..02b4ec6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Make-OCaml-version-requirement-a-lower-bound.patch
 0003-port-code-to-build-against-PXP-1.2.patch
 0004-fix-syntax-errors-in-ocamldoc-tags.patch
+0005-Fix-some-typos.patch

-- 
galax packaging