This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository galax.

commit 861866fffa02b72e28e37cf12817d86c68d313e8
Author: Andreas Moog <andreas.m...@warperbbs.de>
Date:   Fri Jan 31 18:36:23 2014 +0100

    Apply patch from upstream git to fix build with Ocaml4.01
---
 debian/changelog                                   |   7 +
 .../patches/0009-Fix-build-with-ocaml-4.01.patch   | 451 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 459 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 961405f..2428b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+galax (1.1-11) UNRELEASED; urgency=medium
+
+  * Apply patch from upstream git to fix build with Ocaml4.01 
+    (Closes: #731398)
+
+ -- Andreas Moog <andreas.m...@warperbbs.de>  Fri, 31 Jan 2014 14:54:50 +0100
+
 galax (1.1-10) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/0009-Fix-build-with-ocaml-4.01.patch 
b/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
new file mode 100644
index 0000000..7fc6204
--- /dev/null
+++ b/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
@@ -0,0 +1,451 @@
+Description: <short summary of the patch>
+Author: Jerome Simeon <jeromesim...@me.com>
+Bug-Debian: http://bugs.debian.org/731398
+Origin: upstream, 
https://github.com/jeromesimeon/Galax/commit/95c090d1f5a1f70c0013e92c7e70d347ee870dc5.patch
+
+Index: galax-1.1/base/finfo.ml
+===================================================================
+--- galax-1.1.orig/base/finfo.ml       2014-01-31 14:53:51.000000000 +0100
++++ galax-1.1/base/finfo.ml    2014-01-31 14:53:51.000000000 +0100
+@@ -119,7 +119,7 @@
+       let ch =
+       input_char inch
+       in
+-      if ch = '\012' or ch = '\n' then begin
++      if ch = '\012' || ch = '\n' then begin
+       incr lineno;
+       linepos := 0
+       end
+Index: galax-1.1/code_selection/code/code_fn.ml
+===================================================================
+--- galax-1.1.orig/code_selection/code/code_fn.ml      2014-01-31 
14:53:51.000000000 +0100
++++ galax-1.1/code_selection/code/code_fn.ml   2014-01-31 14:53:51.000000000 
+0100
+@@ -271,7 +271,7 @@
+ let float_nan_zero_test =
+   ((fun x ->
+     if x == nan then raise_nan()
+-    else if (x = infinity) or (x = -.infinity) then raise_infinity()
++    else if (x = infinity) || (x = -.infinity) then raise_infinity()
+     else x),
+    (fun x ->
+      if x == nan then raise_nan()
+Index: galax-1.1/config/Makefile.galax-inst
+===================================================================
+--- galax-1.1.orig/config/Makefile.galax-inst  2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/config/Makefile.galax-inst       2014-01-31 14:53:51.000000000 
+0100
+@@ -112,6 +112,7 @@
+ -I $(CONF_OCAML_STDLIB) \
+ -I $(CONF_OCAML_LIBPCRE) \
+ -I $(CONF_OCAML_LIBNETSTRING) \
++-I $(CONF_OCAML_LIBNETSTRING_PCRE) \
+ -I $(CONF_OCAML_LIBPXP) \
+ -I $(CONF_OCAML_LIBPXP_UTF8) \
+ -I $(CONF_OCAML_LIBPXP_ISO88591) \
+@@ -172,6 +173,7 @@
+ bigarray.cma \
+ pcre.cma \
+ netstring.cma \
++netstring-pcre.cma \
+ pxp_engine.cma \
+ pxp_lex_utf8.cma pxp_lex_link_utf8.cmo \
+ pxp_lex_iso88591.cma pxp_lex_link_iso88591.cmo \
+@@ -203,6 +205,7 @@
+ bigarray.cmxa \
+ pcre.cmxa \
+ netstring.cmxa \
++netstring-pcre.cmxa \
+ pxp_engine.cmxa \
+ pxp_lex_utf8.cmxa pxp_lex_link_utf8.cmx \
+ pxp_lex_iso88591.cmxa pxp_lex_link_iso88591.cmx \
+Index: galax-1.1/configure
+===================================================================
+--- galax-1.1.orig/configure   2014-01-31 14:53:51.000000000 +0100
++++ galax-1.1/configure        2014-01-31 14:53:51.000000000 +0100
+@@ -18,7 +18,7 @@
+ # value        2:     on by command line ("forced")
+ 
+ version="1.0"
+-ocaml_version="3.10"
++ocaml_version="4.01"
+ # Function:   print_options()
+ # Description:
+ #             Print the current values of all options
+@@ -124,6 +124,7 @@
+ #             ocaml_pkglib:           This is where the OCaml pkg-lib is 
installed (default=$ocaml_lib/ocaml/pkg-lib)
+ #             ocaml_pcre:                     This is where the OCaml PCRE 
interface is installed (default=$ocaml_pkglib/pcre)
+ #             ocaml_netstring:        This is where the OCaml netstring files 
are installed (default=$ocaml_pkglib/netstring)
++#             ocaml_netstring_pcre:   This is where the OCaml netstring files 
are installed (default=$ocaml_pkglib/netstring-pcre)
+ #             ocaml_equeue:       This is where the OCaml equeue files are 
installed (default=$ocaml_pkglib/equeue)
+ #             ocaml_netclient:        This is where the OCaml netclient files 
are installed (default=$ocaml_pkglib/netclient)
+ #             ocaml_netsys:           This is where the OCaml netsys files 
are installed (default=$ocaml_pkglib/netstring)
+@@ -191,6 +192,7 @@
+ ocaml_pkglib=
+ ocaml_pcre=
+ ocaml_netstring=
++ocaml_netstring_pcre=
+ ocaml_equeue=
+ ocaml_netclient=
+ ocaml_netsys=
+@@ -223,7 +225,7 @@
+ 
+ poptions="local local_bin local_lib local_include"
+ poptions="$poptions galax_home galax_bin galax_lib galax_camllib 
galax_usecases galax_examples galax_regress galax_config galax_capi 
galax_javaapi galax_man regression galax_regression"
+-poptions="$poptions ocaml_home ocaml_bin ocaml_lib ocaml_stdlib ocaml_pkglib 
ocaml_pcre ocaml_netstring ocaml_equeue ocaml_netclient ocaml_netsys ocaml_pxp 
ocaml_pxp_utf8 ocaml_pxp_iso88591 ocaml_camomile ocaml_idl ocaml_idl_bin 
ocaml_libasmrun"
++poptions="$poptions ocaml_home ocaml_bin ocaml_lib ocaml_stdlib ocaml_pkglib 
ocaml_pcre ocaml_netstring ocaml_netstring_pcre ocaml_equeue ocaml_netclient 
ocaml_netsys ocaml_pxp ocaml_pxp_utf8 ocaml_pxp_iso88591 ocaml_camomile 
ocaml_idl ocaml_idl_bin ocaml_libasmrun"
+ poptions="$poptions clib_bdb_lib clib_bdb_inc clib_bdb_name clib_pcre"
+ poptions="$poptions java_home java_bin java_inc java_sysinc"
+ poptions="$poptions regression galax_regression host_type ccoption"
+@@ -261,6 +263,7 @@
+ help_ocaml_pkglib="The directory where OCaml package library files are 
installed"
+ help_ocaml_pcre="The directory where the OCaml PCRE library is installed"
+ help_ocaml_netstring="The directory where the OCaml netstring library is 
installed"
++help_ocaml_netstring_pcre="The directory where the OCaml netstring-pcre 
library is installed"
+ help_ocaml_netclient="The directory where the OCaml netclient library is 
installed"
+ help_ocaml_equeue="The directory where the OCaml equeue library is installed"
+ help_ocaml_netsys="The directory where the OCaml netsys library is installed"
+@@ -680,6 +683,25 @@
+       exit 1
+ fi
+ 
++printf "%s" "Checking for OCaml netstring-pcre library... "
++if [ -z "$ocaml_netstring_pcre" ]
++then
++      if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/netstring-pcre" -a -f 
"$ocaml_pkglib/netstring-pcre/netstring_pcre.cmi" ]
++      then
++              ocaml_netstring_pcre="$ocaml_pkglib/netstring-pcre"
++      elif [ -n "$tool_ocamlfind" ]
++      then
++              ocaml_netstring_pcre=`$tool_ocamlfind query netstring-pcre 
2>/dev/null`
++      fi
++fi
++if [ -n "$ocaml_netstring_pcre" -a -f 
"$ocaml_netstring_pcre/netstring_pcre.cmi" ]
++then
++      echo "found"
++else
++      echo "ERROR: unable to find netstring_pcre.cmi in $ocaml_netstring_pcre"
++      exit 1
++fi
++
+ # equeue is needed by Http_client in netclient
+ printf "%s" "Checking for OCaml equeue library... "
+ if [ -z "$ocaml_equeue" ]
+@@ -1590,6 +1612,7 @@
+ #
+ CONF_OCAML_LIBPCRE=$ocaml_pcre
+ CONF_OCAML_LIBNETSTRING=$ocaml_netstring
++CONF_OCAML_LIBNETSTRING_PCRE=$ocaml_netstring_pcre
+ CONF_OCAML_EQUEUE=$ocaml_equeue
+ CONF_OCAML_LIBNETCLIENT=$ocaml_netclient
+ CONF_OCAML_LIBNETSYS=$ocaml_netsys
+Index: galax-1.1/datatypes/dateTime.ml
+===================================================================
+--- galax-1.1.orig/datatypes/dateTime.ml       2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/datatypes/dateTime.ml    2014-01-31 14:53:51.000000000 +0100
+@@ -182,7 +182,7 @@
+     false otherwise *)
+ 
+ let leapyear year =
+-  if (* year > 1582 &&*) (year mod 400 = 0 or (year mod 4 = 0 && not (year 
mod 100 = 0)))
++  if (* year > 1582 &&*) (year mod 400 = 0 || (year mod 4 = 0 && not (year 
mod 100 = 0)))
+   then true
+   else false
+ 
+@@ -193,7 +193,7 @@
+   match (abs(dtd.dtd_hours), abs(dtd.dtd_minutes)) with
+   | (14, 0) -> ()
+   | (hours, minutes) ->
+-      if hours > 13 or minutes > 59
++      if hours > 13 || minutes > 59
+       then raise (Query (Validation("Not a valid timezone")))
+       else ()
+ 
+@@ -232,9 +232,9 @@
+ 
+ (** Checks an hour minutes and second to determine if the time given is valid 
*)
+ let valid_time (h, m, s) =
+-  if (h < 0 or h > 23) or
+-    (m < 0 or m > 59) or
+-    (Decimal._decimal_lt s Decimal._decimal_zero) or
++  if (h < 0 || h > 23) ||
++    (m < 0 || m > 59) ||
++    (Decimal._decimal_lt s Decimal._decimal_zero) ||
+     (Decimal._decimal_ge s sixty)
+   then raise (Query (Validation("Not a valid time")))
+   else ()
+@@ -264,8 +264,8 @@
+     tz_rel =
+     match tzrel with
+     | Unknown -> Unknown
+-    | _ -> if hours > 0 or minutes > 0 then Positive else
+-      if hours < 0 or minutes < 0 then Negative
++    | _ -> if hours > 0 || minutes > 0 then Positive else
++      if hours < 0 || minutes < 0 then Negative
+       else UTC }
+     
+ (** Creates a time *)
+@@ -629,8 +629,8 @@
+     | Some dtd2 -> 
+       begin
+         valid_timezone dtd2;
+-        let rel = if dtd2.dtd_hours > 0 or dtd2.dtd_minutes > 0 then Positive
+-        else if dtd2.dtd_hours < 0 or dtd2.dtd_minutes < 0 then Negative
++        let rel = if dtd2.dtd_hours > 0 || dtd2.dtd_minutes > 0 then Positive
++        else if dtd2.dtd_hours < 0 || dtd2.dtd_minutes < 0 then Negative
+         else UTC in
+         create_date (year, month, day, rel, dtd2.dtd_hours, dtd2.dtd_minutes)
+       end
+@@ -674,8 +674,8 @@
+     | Some dtd2 ->
+       begin
+         valid_timezone dtd2;
+-        let rel = if dtd2.dtd_hours > 0 or dtd2.dtd_minutes > 0 then Positive
+-        else if dtd2.dtd_hours < 0 or dtd2.dtd_minutes < 0 then Negative
++        let rel = if dtd2.dtd_hours > 0 || dtd2.dtd_minutes > 0 then Positive
++        else if dtd2.dtd_hours < 0 || dtd2.dtd_minutes < 0 then Negative
+         else UTC in
+         create_time (hour, minute, second, rel, dtd2.dtd_hours, 
dtd2.dtd_minutes)
+       end
+@@ -690,8 +690,8 @@
+     | Some dtd2 ->
+       begin
+         valid_timezone dtd2;
+-        let rel = if dtd2.dtd_hours > 0 or dtd2.dtd_minutes > 0 then Positive
+-        else if dtd2.dtd_hours < 0 or dtd2.dtd_minutes < 0 then Negative
++        let rel = if dtd2.dtd_hours > 0 || dtd2.dtd_minutes > 0 then Positive
++        else if dtd2.dtd_hours < 0 || dtd2.dtd_minutes < 0 then Negative
+         else UTC in
+         (dtd1, create_time (hour, minute, second, rel, dtd2.dtd_hours, 
dtd2.dtd_minutes))
+       end
+@@ -708,8 +708,8 @@
+   | Some dtd2 -> 
+       begin
+       valid_timezone dtd2;
+-      let rel = if dtd2.dtd_hours > 0 or dtd2.dtd_minutes > 0 then Positive
+-      else if dtd2.dtd_hours < 0 or dtd2.dtd_minutes < 0 then Negative
++      let rel = if dtd2.dtd_hours > 0 || dtd2.dtd_minutes > 0 then Positive
++      else if dtd2.dtd_hours < 0 || dtd2.dtd_minutes < 0 then Negative
+       else UTC in
+       create_time (hour, minute, second, rel, dtd2.dtd_hours, 
dtd2.dtd_minutes)
+       end
+@@ -725,8 +725,8 @@
+     | Some dtd2 -> 
+       begin
+         valid_timezone dtd2;
+-        let rel = if dtd2.dtd_hours > 0 or dtd2.dtd_minutes > 0 then Positive
+-        else if dtd2.dtd_hours < 0 or dtd2.dtd_minutes < 0 then Negative
++        let rel = if dtd2.dtd_hours > 0 || dtd2.dtd_minutes > 0 then Positive
++        else if dtd2.dtd_hours < 0 || dtd2.dtd_minutes < 0 then Negative
+         else UTC in
+         create_dateTime (date,
+                          time,
+@@ -1225,9 +1225,9 @@
+    @param dtd The dayTimeDuration
+    @return Positive, Negative, or UTC depending on the offset *)
+ let findOffset dtd =
+-  if dtd.dtd_days > 0 or dtd.dtd_hours > 0 or dtd.dtd_minutes > 0 or 
++  if dtd.dtd_days > 0 || dtd.dtd_hours > 0 || dtd.dtd_minutes > 0 ||
+     Decimal._decimal_gt dtd.dtd_seconds Decimal._decimal_zero then Positive
+-  else if dtd.dtd_days < 0 or dtd.dtd_hours < 0 or dtd.dtd_minutes < 0 or 
++  else if dtd.dtd_days < 0 || dtd.dtd_hours < 0 || dtd.dtd_minutes < 0 ||
+     Decimal._decimal_lt dtd.dtd_seconds Decimal._decimal_zero then Negative
+   else UTC
+ 
+@@ -1530,7 +1530,7 @@
+    @param ymd The yearMonthDuration
+    @return Positive or Negative depending on the yearMonthDuration *)
+ let ymd_direction ymd =
+-  if ymd.ymd_years > 0 or ymd.ymd_months > 0 then Positive
++  if ymd.ymd_years > 0 || ymd.ymd_months > 0 then Positive
+   else Negative
+ 
+ (** Add the specified number of months to a date consisting of a year and a 
month.
+Index: galax-1.1/dm/atomic/dm_atomic.ml
+===================================================================
+--- galax-1.1.orig/dm/atomic/dm_atomic.ml      2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/dm/atomic/dm_atomic.ml   2014-01-31 14:53:51.000000000 +0100
+@@ -355,7 +355,7 @@
+       | ATString ->
+         ((new atomicString ~ta:at (serialize_float v')) :> atomicValue)
+       | ATBoolean -> 
+-        (new atomicBoolean ~ta:at (if v' = 0.0 or Decimal.is_nan v' then 
false else true))
++        (new atomicBoolean ~ta:at (if v' = 0.0 || Decimal.is_nan v' then 
false else true))
+       | ATDecimal -> 
+         (new atomicDecimal ~ta:at (Decimal._decimal_of_float v'))
+       | ATFloat -> 
+@@ -430,7 +430,7 @@
+       | ATString ->
+         ((new atomicString ~ta:at (serialize_double v') :> atomicValue))
+       | ATBoolean -> 
+-        (new atomicBoolean ~ta:at (if v' = 0.0 or Decimal.is_nan v' then 
false else true))
++        (new atomicBoolean ~ta:at (if v' = 0.0 || Decimal.is_nan v' then 
false else true))
+       | ATDecimal ->
+         (new atomicDecimal ~ta:at (Decimal._cast_double_to_decimal v'))
+       | ATFloat -> 
+@@ -636,8 +636,6 @@
+     method getAtomicDateTime () = v'
+     method private eq a = 
+         dateTime_equal None v' (a#getAtomicDateTime())
+-    method private eq a = 
+-        dateTime_equal None v' (a#getAtomicDateTime())
+     method private lteq a = 
+         dateTime_lteq None v' (a#getAtomicDateTime())
+     method private lt a = 
+@@ -780,8 +778,6 @@
+     method getAtomicTime () = v'
+     method private eq a = 
+         time_equal None v' (a#getAtomicTime())
+-    method private eq a = 
+-        time_equal None v' (a#getAtomicTime())
+     method private lteq a = 
+         time_lteq None v' (a#getAtomicTime())
+     method private lt a = 
+Index: galax-1.1/normalization/norm_expr.ml
+===================================================================
+--- galax-1.1.orig/normalization/norm_expr.ml  2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/normalization/norm_expr.ml       2014-01-31 14:53:51.000000000 
+0100
+@@ -292,7 +292,7 @@
+             (cexpr_fs_dot (Some e) fi) :: []
+           else if (rqname_equal rfname fn_substring && arity = 2) then
+             celist @ (fmkcexpr (CEScalar (DoubleLiteral infinity)) (Some e) 
fi):: []
+-          else if ((rqname_equal rfname fn_matches or rqname_equal rfname 
fn_tokenize) && arity = 2) then
++          else if ((rqname_equal rfname fn_matches || rqname_equal rfname 
fn_tokenize) && arity = 2) then
+             celist @ (fmkcexpr (CEScalar (StringLiteral "")) (Some e) fi) :: 
[]
+           else if (rqname_equal rfname fn_replace && arity = 3) then
+             celist @ (fmkcexpr (CEScalar (StringLiteral "")) (Some e) fi) :: 
[]
+Index: galax-1.1/normalization/norm_ident_expr.ml
+===================================================================
+--- galax-1.1.orig/normalization/norm_ident_expr.ml    2014-01-31 
14:53:51.000000000 +0100
++++ galax-1.1/normalization/norm_ident_expr.ml 2014-01-31 14:53:51.000000000 
+0100
+@@ -154,13 +154,13 @@
+           else if (rqname_equal rfname fn_substring && arity = 2) then
+           (* Pass 1000000 as the length of the substring because I'm not sure 
how to get at the data right now. Change later *)
+             celist @ (fmkcexpr (CEScalar(DoubleLiteral 
(double_of_untyped("1000000.0")))) (Some e) fi):: []
+-          else if ((rqname_equal rfname fn_matches or rqname_equal rfname 
fn_tokenize) && arity = 2) then
++          else if ((rqname_equal rfname fn_matches || rqname_equal rfname 
fn_tokenize) && arity = 2) then
+             celist @ (fmkcexpr (CEScalar(StringLiteral "")) (Some e) fi) :: []
+           else if (rqname_equal rfname fn_replace && arity = 3) then
+             celist @ (fmkcexpr (CEScalar(StringLiteral "")) (Some e) fi) :: []
+           else if ((rqname_equal rfname fn_adjust_time_to_timezone 
+-                      or rqname_equal rfname fn_adjust_date_to_timezone
+-                      or rqname_equal rfname fn_adjust_dateTime_to_timezone)
++                  || rqname_equal rfname fn_adjust_date_to_timezone
++                  || rqname_equal rfname fn_adjust_dateTime_to_timezone)
+                      && arity = 1) then
+             celist @ [cempty]
+           else
+Index: galax-1.1/tools/http/http.ml
+===================================================================
+--- galax-1.1.orig/tools/http/http.ml  2014-01-31 14:53:51.000000000 +0100
++++ galax-1.1/tools/http/http.ml       2014-01-31 14:53:51.000000000 +0100
+@@ -71,8 +71,8 @@
+   (* Scan past "\r\n\r\n" *)
+   let rec after_crlfcrlf result start =
+     let cr = String.index_from result start '\r' in
+-    if String.get result (cr+1) = '\n' &
+-      String.get result (cr+2) = '\r' &
++    if String.get result (cr+1) = '\n' &&
++      String.get result (cr+2) = '\r' &&
+       String.get result (cr+3) = '\n'
+     then cr+4
+     else after_crlfcrlf result (cr+1) 
+@@ -272,7 +272,7 @@
+   let rec get_headers inchan =
+     try
+       let line = input_line inchan in
+-      if (line = "" or line = "\r") then [] else
++      if (line = "" || line = "\r") then [] else
+       (header_of_line line)::(get_headers inchan)
+     with End_of_file -> []
+ 
+Index: galax-1.1/tools/insert_variant
+===================================================================
+--- galax-1.1.orig/tools/insert_variant        2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/tools/insert_variant     2014-01-31 14:53:51.000000000 +0100
+@@ -72,7 +72,7 @@
+     while true do
+       let line = input_line chin in
+       (* We do not have Str here. *)
+-      if String.length line >= 8 & String.sub line 0 8 = "#insert " then begin
++      if String.length line >= 8 && String.sub line 0 8 = "#insert " then 
begin
+       let insname = get_arg variant line in
+       (* Copy the file 'insname' to chout *)
+       let chcopy = open_in_bin insname in
+Index: galax-1.1/tools/stemmer/stemmer.ml
+===================================================================
+--- galax-1.1.orig/tools/stemmer/stemmer.ml    2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/tools/stemmer/stemmer.ml 2014-01-31 14:53:51.000000000 +0100
+@@ -166,10 +166,10 @@
+ let ends_with_cvc str =
+   let len = (String.length str) in
+   let vowel_or_y c =
+-    (is_vowel c) or c = 'y'
++    (is_vowel c) || c = 'y'
+   in
+   let vowel_or_wxy c =
+-    (vowel_or_y c) or c = 'x' or c = 'w'
++    (vowel_or_y c) || c = 'x' || c = 'w'
+   in
+     if len < 3 then
+       false
+Index: galax-1.1/website/demo/.depend
+===================================================================
+--- galax-1.1.orig/website/demo/.depend        2014-01-31 14:53:51.000000000 
+0100
++++ galax-1.1/website/demo/.depend     2014-01-31 14:53:51.000000000 +0100
+@@ -1,8 +1,8 @@
+-demo_conf.cmo: demo_conf.cmi 
+-demo_conf.cmx: demo_conf.cmi 
+-querycgi.cmo: demo_conf.cmi 
+-querycgi.cmx: demo_conf.cmx 
+-usecase.cmo: demo_conf.cmi 
+-usecase.cmx: demo_conf.cmx 
+-viewxml.cmo: demo_conf.cmi 
+-viewxml.cmx: demo_conf.cmx 
++demo_conf.cmo : demo_conf.cmi 
++demo_conf.cmx : demo_conf.cmi 
++querycgi.cmo : demo_conf.cmi 
++querycgi.cmx : demo_conf.cmx 
++usecase.cmo : demo_conf.cmi 
++usecase.cmx : demo_conf.cmx 
++viewxml.cmo : demo_conf.cmi 
++viewxml.cmx : demo_conf.cmx 
+Index: galax-1.1/wsdl/wsdl_load.mlp
+===================================================================
+--- galax-1.1.orig/wsdl/wsdl_load.mlp  2014-01-31 14:53:51.000000000 +0100
++++ galax-1.1/wsdl/wsdl_load.mlp       2014-01-31 14:53:51.000000000 +0100
+@@ -236,7 +236,7 @@
+         begin
+           match rattr_name rsym with  _,_,name ->
+               if name = "name" then get_ntx (Some t) d rest
+-              else if name = "element" or name = "type" then
++              else if name = "element" || name = "type" then
+               begin
+                 let qn = uqname_element_of_string t in
+                   match qn with p, s ->
+Index: galax-1.1/config/Makefile.galax
+===================================================================
+--- galax-1.1.orig/config/Makefile.galax       2014-01-31 14:45:33.000000000 
+0100
++++ galax-1.1/config/Makefile.galax    2014-01-31 15:04:21.846904135 +0100
+@@ -1175,6 +1175,7 @@
+ -I $(CONF_OCAML_STDLIB) \
+ -I $(CONF_OCAML_LIBPCRE) \
+ -I $(CONF_OCAML_LIBNETSTRING) \
++-I $(CONF_OCAML_LIBNETSTRING_PCRE) \
+ -I $(CONF_OCAML_EQUEUE) \
+ -I $(CONF_OCAML_LIBNETCLIENT) \
+ -I $(CONF_OCAML_LIBPXP) \
+@@ -1258,6 +1259,7 @@
+ endif
+ OCAML_LIBS+=\
+ netstring.cma \
++netstring-pcre.cma \
+ equeue.cma \
+ netclient.cma \
+ pxp_engine.cma \
+@@ -1292,6 +1294,7 @@
+ endif
+ OCAML_OPTLIBS+=\
+ netstring.cmxa \
++netstring-pcre.cmxa \
+ equeue.cmxa \
+ netclient.cmxa \
+ pxp_engine.cmxa \
diff --git a/debian/patches/series b/debian/patches/series
index 3815ff7..2ebdb51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Compile-with-ocamlnet-3.3.5.patch
 0007-Fix-build-with-camomile-0.8.3.patch
 0008-Fix-configure-for-hurd.patch
+0009-Fix-build-with-ocaml-4.01.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to