[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-4-10-g03e4365

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 0fea9c273b0f5c3d9073da1e3335ed411228fea1
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Mar 19 12:33:01 2009 +0100

    new patch build-pxp-1.2, forward port code to build against PXP 1.2

diff --git a/debian/changelog b/debian/changelog
index 88ea8a3..f331cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ galax (1.1-5) unstable; urgency=low
     - use ocaml.mk class as a "rules" file, as now is
   * debian/patches/
     - new patch ocaml-3.11, just bumping the expected version to 3.11
+    - new patch build-pxp-1.2, forward port code to build against PXP 1.2
 
  -- Stefano Zacchiroli <zack at debian.org>  Thu, 19 Mar 2009 11:44:26 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 6364cd8..ca279ec 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 missing-BUGS-doc.dpatch
 ocaml-3.11.dpatch
+build-pxp-1.2.dpatch
diff --git a/debian/patches/build-pxp-1.2.dpatch b/debian/patches/build-pxp-1.2.dpatch
new file mode 100755
index 0000000..1ba0d74
--- /dev/null
+++ b/debian/patches/build-pxp-1.2.dpatch
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocaml-3.11.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: port code to build against PXP 1.2
+
+ at DPATCH@
+diff -urNad galax~/base/encoding.ml galax/base/encoding.ml
+--- galax~/base/encoding.ml	2008-07-19 22:21:07.000000000 +0200
++++ galax/base/encoding.ml	2009-03-19 12:20:38.942492094 +0100
+@@ -131,14 +131,14 @@
+   let write_ascii s =
+     (* Write the ASCII-encoded string 's' *)
+     let s' = convert_ascii s in
+-    Pxp_core_types.write os s' 0 (String.length s')
++    Pxp_types.write os s' 0 (String.length s')
+   in
+ 
+   let write_part j l =
+     (* Writes the substring of 'content' beginning at pos 'j' with length 'l'
+      *)
+     if to_enc = (from_enc :> encoding) then
+-      Pxp_core_types.write os content j l
++      Pxp_types.write os content j l
+     else begin
+       let s' = Netconversion.recode_string
+ 	         ~in_enc:(from_enc :> encoding)
+@@ -147,7 +147,7 @@
+ 			   convert_ascii ("&#" ^ string_of_int n ^ ";"))
+ 		 (String.sub content j l)
+       in
+-      Pxp_core_types.write os s' 0 (String.length s')
++      Pxp_types.write os s' 0 (String.length s')
+     end
+   in
+   let i = ref 0 in
+@@ -197,6 +197,6 @@
+   try
+     Pxp_aux.character enc global_warner k
+   with
+-  | Pxp_core_types.WF_error msg ->
++  | Pxp_types.WF_error msg ->
+       raise (Query (Undefined msg))
+ 
+diff -urNad galax~/regress/test_core.ml galax/regress/test_core.ml
+--- galax~/regress/test_core.ml	2008-07-19 22:21:07.000000000 +0200
++++ galax/regress/test_core.ml	2009-03-19 12:28:41.646448174 +0100
+@@ -732,7 +732,7 @@
+     let expected_stream = typed_stream_of_io (File_Input output_file) in
+     compare_streams case output_file result_stream expected_stream compared_plan
+   with
+-  | Pxp_core_types.Error _ as e ->
++  | Pxp_types.Error _ as e ->
+       if !(Conf.genresults)
+       then
+ 	begin
+@@ -755,7 +755,7 @@
+     let expected_stream = typed_stream_of_io (File_Input output_file) in
+     compare_streams case output_file result_stream expected_stream compared_plan
+   with
+-  | Pxp_core_types.Error _ as e ->
++  | Pxp_types.Error _ as e ->
+       if !(Conf.genresults)
+       then
+ 	begin
+diff -urNad galax~/schema/schema_dtd_import.ml galax/schema/schema_dtd_import.ml
+--- galax~/schema/schema_dtd_import.ml	2008-07-19 22:21:07.000000000 +0200
++++ galax/schema/schema_dtd_import.ml	2009-03-19 12:23:55.478444056 +0100
+@@ -15,7 +15,7 @@
+      This module imports a DTD as a set of XML Schema declarations.
+ *)
+ 
+-open Pxp_core_types
++open Pxp_types
+ open Pxp_dtd
+ 
+ open Error
+diff -urNad galax~/schema/schema_import.mlp galax/schema/schema_import.mlp
+--- galax~/schema/schema_import.mlp	2008-07-19 22:21:07.000000000 +0200
++++ galax/schema/schema_import.mlp	2009-03-19 12:15:47.310444622 +0100
+@@ -1075,7 +1075,7 @@
+ 	  end
+ 
+ let global_notation ims = parser
+-  | [< _ = skip_element_named "notation"; >] -> ()
++  | [< _ = skip_element_named "notation" >] -> ()
+ 
+ let global_attribute ims = parser
+   | [< (ims,atts,fi) = open_tag ims "attribute";
+diff -urNad galax~/streaming/streaming_parse.ml galax/streaming/streaming_parse.ml
+--- galax~/streaming/streaming_parse.ml	2008-07-19 22:21:07.000000000 +0200
++++ galax/streaming/streaming_parse.ml	2009-03-19 12:22:43.691238705 +0100
+@@ -130,8 +130,6 @@
+       Some (fmkse_event (SAX_characters (make_text_desc data)) (!fi_ref))
+   | E_pinstr (target,value,entid) ->
+       Some (fmkse_event (SAX_processingInstruction (make_pi_desc target value)) (!fi_ref))
+-  | E_pinstr_member (target,value,entid) ->
+-      Some (fmkse_event (SAX_processingInstruction (make_pi_desc target value)) (!fi_ref))
+   | E_comment content ->
+       Some (fmkse_event (SAX_comment (make_comment_desc content)) (!fi_ref))
+   (* Silently ignoring super root event *)

-- 
galax packaging