[Pkg-ocaml-maint-commits] [galax] 01/05: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Sat Aug 13 10:44:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository galax.
commit f2529bf149ad9bbb491c4175c445afc4ef859f68
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Aug 13 10:39:01 2016 +0200
Refresh patches
---
...-BUGS-document-as-it-is-sourced-by-other-.patch | 5 +-
...e-OCaml-version-requirement-a-lower-bound.patch | 5 +-
.../0003-port-code-to-build-against-PXP-1.2.patch | 11 +-
.../0004-fix-syntax-errors-in-ocamldoc-tags.patch | 5 +-
debian/patches/0005-Fix-some-typos.patch | 5 +-
.../patches/0006-Compile-with-ocamlnet-3.3.5.patch | 5 +-
.../0007-Fix-build-with-camomile-0.8.3.patch | 7 +-
debian/patches/0008-Fix-configure-for-hurd.patch | 5 +-
.../patches/0009-Fix-build-with-ocaml-4.01.patch | 246 +++++++++++----------
...010-Fix-space-tab-issue-in-some-Makefiles.patch | 5 +-
.../patches/0011-Compile-with-ocamlnet-4.0.4.patch | 1 -
11 files changed, 155 insertions(+), 145 deletions(-)
diff --git a/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch b/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
index 29c7b64..97d5c28 100644
--- a/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
+++ b/debian/patches/0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
@@ -3,8 +3,8 @@ Date: Tue, 6 Oct 2009 22:43:58 +0200
Subject: add a (empty) BUGS document as it is sourced by other TeX files
---
- BUGS | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ BUGS | 1 +
+ 1 file changed, 1 insertion(+)
create mode 100644 BUGS
diff --git a/BUGS b/BUGS
@@ -14,4 +14,3 @@ index 0000000..8b13789
+++ b/BUGS
@@ -0,0 +1 @@
+
---
diff --git a/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch
index 93247a7..46c252f 100644
--- a/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch
+++ b/debian/patches/0002-Make-OCaml-version-requirement-a-lower-bound.patch
@@ -3,8 +3,8 @@ Date: Tue, 18 May 2010 17:54:37 +0200
Subject: Make OCaml version requirement a lower bound
---
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 9a7fa2b..fcd9393 100755
@@ -19,4 +19,3 @@ index 9a7fa2b..fcd9393 100755
then
echo "ERROR: Expected OCaml major version ${ocaml_version}, found ${ocaml_major_version}"
exit 1
---
diff --git a/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
index a1dc291..097a3c2 100644
--- a/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
+++ b/debian/patches/0003-port-code-to-build-against-PXP-1.2.patch
@@ -3,11 +3,11 @@ Date: Tue, 6 Oct 2009 22:45:20 +0200
Subject: port code to build against PXP 1.2
---
- base/encoding.ml | 8 ++++----
- regress/test_core.ml | 4 ++--
- schema/schema_dtd_import.ml | 2 +-
- schema/schema_import.mlp | 2 +-
- streaming/streaming_parse.ml | 2 --
+ base/encoding.ml | 8 ++++----
+ regress/test_core.ml | 4 ++--
+ schema/schema_dtd_import.ml | 2 +-
+ schema/schema_import.mlp | 2 +-
+ streaming/streaming_parse.ml | 2 --
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/base/encoding.ml b/base/encoding.ml
@@ -109,4 +109,3 @@ index 4248eaf..3a49684 100644
| E_comment content ->
Some (fmkse_event (SAX_comment (make_comment_desc content)) (!fi_ref))
(* Silently ignoring super root event *)
---
diff --git a/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch
index c6d628e..27472d8 100644
--- a/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch
+++ b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch
@@ -3,8 +3,8 @@ Date: Wed, 7 Oct 2009 09:12:53 +0200
Subject: fix syntax errors in ocamldoc @tags
---
- streaming/sax_annot.mli | 4 ++--
- wsdl/wsdl_ast.mli | 2 +-
+ streaming/sax_annot.mli | 4 ++--
+ wsdl/wsdl_ast.mli | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/streaming/sax_annot.mli b/streaming/sax_annot.mli
@@ -42,4 +42,3 @@ index 088aef0..5f5c6f2 100644
*)
---
diff --git a/debian/patches/0005-Fix-some-typos.patch b/debian/patches/0005-Fix-some-typos.patch
index 916d3a9..a7fd525 100644
--- a/debian/patches/0005-Fix-some-typos.patch
+++ b/debian/patches/0005-Fix-some-typos.patch
@@ -4,8 +4,8 @@ Subject: Fix some typos
Submitted upstream.
---
- lexing/lexing_util.ml | 2 +-
- optimization/optimization_judge.ml | 4 ++--
+ 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
@@ -43,4 +43,3 @@ index 38de03a..d9ddfb1 100644
List.iter (fun x -> Debug.print_join_debug ("\t\t" ^ Namespace_names.prefixed_string_of_rqname x)) fields;
end
---
diff --git a/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
index 477f5bc..e3d1eea 100644
--- a/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
+++ b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
@@ -4,8 +4,8 @@ Subject: Compile with ocamlnet 3.3.5
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- config/Makefile.galax | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ config/Makefile.galax | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/Makefile.galax b/config/Makefile.galax
index f465ace..391b5d4 100644
@@ -29,4 +29,3 @@ index f465ace..391b5d4 100644
endif
OCAML_OPTLIBS+=\
netstring.cmxa \
---
diff --git a/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch b/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch
index 82a67e6..8c0d206 100644
--- a/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch
+++ b/debian/patches/0007-Fix-build-with-camomile-0.8.3.patch
@@ -5,9 +5,9 @@ Subject: Fix build with camomile 0.8.3
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636025
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- base/galax_camomile_0.8.ml | 73 ++++++++++++++++++++++++++++++++++++++++++++
- configure | 6 +++-
- 2 files changed, 78 insertions(+), 1 deletions(-)
+ base/galax_camomile_0.8.ml | 73 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure | 6 +++-
+ 2 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 base/galax_camomile_0.8.ml
diff --git a/base/galax_camomile_0.8.ml b/base/galax_camomile_0.8.ml
@@ -106,4 +106,3 @@ index fcd9393..9e46c10 100755
then
ocaml_camomile_version="0.7"
echo "found version 0.7"
---
diff --git a/debian/patches/0008-Fix-configure-for-hurd.patch b/debian/patches/0008-Fix-configure-for-hurd.patch
index d349fe4..1020b7c 100644
--- a/debian/patches/0008-Fix-configure-for-hurd.patch
+++ b/debian/patches/0008-Fix-configure-for-hurd.patch
@@ -5,8 +5,8 @@ Subject: Fix configure for hurd
Bug-Debian: bugs.debian.org/cgi-bin/bugreport.cgi?bug=647765
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 9e46c10..cee1a25 100755
@@ -21,4 +21,3 @@ index 9e46c10..cee1a25 100755
arch_EXE=
arch_DLL=.so
arch_JNIDLL=$arch_DLL
---
diff --git a/debian/patches/0009-Fix-build-with-ocaml-4.01.patch b/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
index 3583902..08260db 100644
--- a/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
+++ b/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
@@ -1,12 +1,32 @@
From: Jerome Simeon <jeromesimeon at me.com>
+Date: Sat, 13 Aug 2016 10:33:36 +0200
+Subject: Fix-build-with-ocaml-4.01
+
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 @@
+---
+ base/finfo.ml | 2 +-
+ code_selection/code/code_fn.ml | 2 +-
+ config/Makefile.galax | 3 +++
+ config/Makefile.galax-inst | 3 +++
+ configure | 27 +++++++++++++++++++++++++--
+ datatypes/dateTime.ml | 40 ++++++++++++++++++++--------------------
+ dm/atomic/dm_atomic.ml | 8 ++------
+ normalization/norm_expr.ml | 2 +-
+ normalization/norm_ident_expr.ml | 6 +++---
+ tools/http/http.ml | 6 +++---
+ tools/insert_variant | 2 +-
+ tools/stemmer/stemmer.ml | 4 ++--
+ website/demo/.depend | 16 ++++++++--------
+ wsdl/wsdl_load.mlp | 2 +-
+ 14 files changed, 74 insertions(+), 49 deletions(-)
+
+diff --git a/base/finfo.ml b/base/finfo.ml
+index 87dc188..7e34b53 100644
+--- a/base/finfo.ml
++++ b/base/finfo.ml
+@@ -119,7 +119,7 @@ let loc_in_file file_name pos =
let ch =
input_char inch
in
@@ -15,11 +35,11 @@ Index: galax-1.1/base/finfo.ml
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 @@
+diff --git a/code_selection/code/code_fn.ml b/code_selection/code/code_fn.ml
+index f7fccdd..b90acb9 100644
+--- a/code_selection/code/code_fn.ml
++++ b/code_selection/code/code_fn.ml
+@@ -271,7 +271,7 @@ let decimal_zero_test =
let float_nan_zero_test =
((fun x ->
if x == nan then raise_nan()
@@ -28,11 +48,39 @@ Index: galax-1.1/code_selection/code/code_fn.ml
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 @@
+diff --git a/config/Makefile.galax b/config/Makefile.galax
+index 391b5d4..9abcead 100644
+--- a/config/Makefile.galax
++++ b/config/Makefile.galax
+@@ -1175,6 +1175,7 @@ OCAML_LIB_INCLUDES=\
+ -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 @@ OCAML_LIBS+=netsys_oothr.cma netsys.cma
+ endif
+ OCAML_LIBS+=\
+ netstring.cma \
++netstring-pcre.cma \
+ equeue.cma \
+ netclient.cma \
+ pxp_engine.cma \
+@@ -1292,6 +1294,7 @@ OCAML_OPTLIBS+=netsys_oothr.cmxa netsys.cmxa
+ endif
+ OCAML_OPTLIBS+=\
+ netstring.cmxa \
++netstring-pcre.cmxa \
+ equeue.cmxa \
+ netclient.cmxa \
+ pxp_engine.cmxa \
+diff --git a/config/Makefile.galax-inst b/config/Makefile.galax-inst
+index 2f56901..6933edf 100644
+--- a/config/Makefile.galax-inst
++++ b/config/Makefile.galax-inst
+@@ -112,6 +112,7 @@ OCAML_LIB_INCLUDES=\
-I $(CONF_OCAML_STDLIB) \
-I $(CONF_OCAML_LIBPCRE) \
-I $(CONF_OCAML_LIBNETSTRING) \
@@ -40,7 +88,7 @@ Index: galax-1.1/config/Makefile.galax-inst
-I $(CONF_OCAML_LIBPXP) \
-I $(CONF_OCAML_LIBPXP_UTF8) \
-I $(CONF_OCAML_LIBPXP_ISO88591) \
-@@ -172,6 +173,7 @@
+@@ -172,6 +173,7 @@ str.cma \
bigarray.cma \
pcre.cma \
netstring.cma \
@@ -48,7 +96,7 @@ Index: galax-1.1/config/Makefile.galax-inst
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 @@
+@@ -203,6 +205,7 @@ str.cmxa \
bigarray.cmxa \
pcre.cmxa \
netstring.cmxa \
@@ -56,10 +104,10 @@ Index: galax-1.1/config/Makefile.galax-inst
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
+diff --git a/configure b/configure
+index cee1a25..b513732 100755
+--- a/configure
++++ b/configure
@@ -18,7 +18,7 @@
# value 2: on by command line ("forced")
@@ -69,7 +117,7 @@ Index: galax-1.1/configure
# Function: print_options()
# Description:
# Print the current values of all options
-@@ -124,6 +124,7 @@
+@@ -124,6 +124,7 @@ usage() {
# 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)
@@ -77,7 +125,7 @@ Index: galax-1.1/configure
# 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 @@
+@@ -191,6 +192,7 @@ ocaml_stdlib=
ocaml_pkglib=
ocaml_pcre=
ocaml_netstring=
@@ -85,7 +133,7 @@ Index: galax-1.1/configure
ocaml_equeue=
ocaml_netclient=
ocaml_netsys=
-@@ -223,7 +225,7 @@
+@@ -223,7 +225,7 @@ ccoption=
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"
@@ -94,7 +142,7 @@ Index: galax-1.1/configure
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 @@
+@@ -261,6 +263,7 @@ help_ocaml_stdlib="The directory where OCaml standard library files are installe
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"
@@ -102,7 +150,7 @@ Index: galax-1.1/configure
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 @@
+@@ -680,6 +683,25 @@ else
exit 1
fi
@@ -128,7 +176,7 @@ Index: galax-1.1/configure
# equeue is needed by Http_client in netclient
printf "%s" "Checking for OCaml equeue library... "
if [ -z "$ocaml_equeue" ]
-@@ -1590,6 +1612,7 @@
+@@ -1590,6 +1612,7 @@ CONF_PACKAGE_SRC=$package_src
#
CONF_OCAML_LIBPCRE=$ocaml_pcre
CONF_OCAML_LIBNETSTRING=$ocaml_netstring
@@ -136,11 +184,11 @@ Index: galax-1.1/configure
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 @@
+diff --git a/datatypes/dateTime.ml b/datatypes/dateTime.ml
+index b4c1a3e..05f1619 100644
+--- a/datatypes/dateTime.ml
++++ b/datatypes/dateTime.ml
+@@ -182,7 +182,7 @@ let maximumDayInMonthFor(yearValue, monthValue) =
false otherwise *)
let leapyear year =
@@ -149,7 +197,7 @@ Index: galax-1.1/datatypes/dateTime.ml
then true
else false
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ let valid_timezone dtd =
match (abs(dtd.dtd_hours), abs(dtd.dtd_minutes)) with
| (14, 0) -> ()
| (hours, minutes) ->
@@ -158,7 +206,7 @@ Index: galax-1.1/datatypes/dateTime.ml
then raise (Query (Validation("Not a valid timezone")))
else ()
-@@ -232,9 +232,9 @@
+@@ -232,9 +232,9 @@ let valid_date (yearopt, month, day) =
(** Checks an hour minutes and second to determine if the time given is valid *)
let valid_time (h, m, s) =
@@ -171,7 +219,7 @@ Index: galax-1.1/datatypes/dateTime.ml
(Decimal._decimal_ge s sixty)
then raise (Query (Validation("Not a valid time")))
else ()
-@@ -264,8 +264,8 @@
+@@ -264,8 +264,8 @@ let create_timezone (tzrel, hours, minutes) =
tz_rel =
match tzrel with
| Unknown -> Unknown
@@ -182,7 +230,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC }
(** Creates a time *)
-@@ -629,8 +629,8 @@
+@@ -629,8 +629,8 @@ let mkdate (yearopt, month, day, dtd) =
| Some dtd2 ->
begin
valid_timezone dtd2;
@@ -193,7 +241,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC in
create_date (year, month, day, rel, dtd2.dtd_hours, dtd2.dtd_minutes)
end
-@@ -674,8 +674,8 @@
+@@ -674,8 +674,8 @@ let mktime (hour, minute, second, dtd) =
| Some dtd2 ->
begin
valid_timezone dtd2;
@@ -204,7 +252,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC in
create_time (hour, minute, second, rel, dtd2.dtd_hours, dtd2.dtd_minutes)
end
-@@ -690,8 +690,8 @@
+@@ -690,8 +690,8 @@ let mktime_dtd (hour, minute, second, dtd) =
| Some dtd2 ->
begin
valid_timezone dtd2;
@@ -215,7 +263,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC in
(dtd1, create_time (hour, minute, second, rel, dtd2.dtd_hours, dtd2.dtd_minutes))
end
-@@ -708,8 +708,8 @@
+@@ -708,8 +708,8 @@ let mktime_noerr (hour, minute, second, dtd) =
| Some dtd2 ->
begin
valid_timezone dtd2;
@@ -226,7 +274,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC in
create_time (hour, minute, second, rel, dtd2.dtd_hours, dtd2.dtd_minutes)
end
-@@ -725,8 +725,8 @@
+@@ -725,8 +725,8 @@ let mkdateTime (date, time, dtd) =
| Some dtd2 ->
begin
valid_timezone dtd2;
@@ -237,7 +285,7 @@ Index: galax-1.1/datatypes/dateTime.ml
else UTC in
create_dateTime (date,
time,
-@@ -1225,9 +1225,9 @@
+@@ -1225,9 +1225,9 @@ let time_from_dateTime dt = dt.dt_time
@param dtd The dayTimeDuration
@return Positive, Negative, or UTC depending on the offset *)
let findOffset dtd =
@@ -249,7 +297,7 @@ Index: galax-1.1/datatypes/dateTime.ml
Decimal._decimal_lt dtd.dtd_seconds Decimal._decimal_zero then Negative
else UTC
-@@ -1530,7 +1530,7 @@
+@@ -1530,7 +1530,7 @@ let default_dateTime() =
@param ymd The yearMonthDuration
@return Positive or Negative depending on the yearMonthDuration *)
let ymd_direction ymd =
@@ -258,11 +306,11 @@ Index: galax-1.1/datatypes/dateTime.ml
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 @@
+diff --git a/dm/atomic/dm_atomic.ml b/dm/atomic/dm_atomic.ml
+index 5846683..40def87 100644
+--- a/dm/atomic/dm_atomic.ml
++++ b/dm/atomic/dm_atomic.ml
+@@ -355,7 +355,7 @@ and atomicFloat ?ta:type_annotation v =
| ATString ->
((new atomicString ~ta:at (serialize_float v')) :> atomicValue)
| ATBoolean ->
@@ -271,7 +319,7 @@ Index: galax-1.1/dm/atomic/dm_atomic.ml
| ATDecimal ->
(new atomicDecimal ~ta:at (Decimal._decimal_of_float v'))
| ATFloat ->
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ and atomicDouble ?ta:type_annotation v =
| ATString ->
((new atomicString ~ta:at (serialize_double v') :> atomicValue))
| ATBoolean ->
@@ -280,7 +328,7 @@ Index: galax-1.1/dm/atomic/dm_atomic.ml
| ATDecimal ->
(new atomicDecimal ~ta:at (Decimal._cast_double_to_decimal v'))
| ATFloat ->
-@@ -636,8 +636,6 @@
+@@ -636,8 +636,6 @@ and atomicDateTime ?ta:type_annotation v =
method getAtomicDateTime () = v'
method private eq a =
dateTime_equal None v' (a#getAtomicDateTime())
@@ -289,7 +337,7 @@ Index: galax-1.1/dm/atomic/dm_atomic.ml
method private lteq a =
dateTime_lteq None v' (a#getAtomicDateTime())
method private lt a =
-@@ -780,8 +778,6 @@
+@@ -780,8 +778,6 @@ and atomicTime ?ta:type_annotation v =
method getAtomicTime () = v'
method private eq a =
time_equal None v' (a#getAtomicTime())
@@ -298,11 +346,11 @@ Index: galax-1.1/dm/atomic/dm_atomic.ml
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 @@
+diff --git a/normalization/norm_expr.ml b/normalization/norm_expr.ml
+index 8f5f5a6..76033a7 100644
+--- a/normalization/norm_expr.ml
++++ b/normalization/norm_expr.ml
+@@ -292,7 +292,7 @@ let normalize_expr norm_context e =
(cexpr_fs_dot (Some e) fi) :: []
else if (rqname_equal rfname fn_substring && arity = 2) then
celist @ (fmkcexpr (CEScalar (DoubleLiteral infinity)) (Some e) fi):: []
@@ -311,11 +359,11 @@ Index: galax-1.1/normalization/norm_expr.ml
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 @@
+diff --git a/normalization/norm_ident_expr.ml b/normalization/norm_ident_expr.ml
+index 69726c2..5114d31 100644
+--- a/normalization/norm_ident_expr.ml
++++ b/normalization/norm_ident_expr.ml
+@@ -154,13 +154,13 @@ let normalize_ident_expr norm_context e =
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):: []
@@ -332,11 +380,11 @@ Index: galax-1.1/normalization/norm_ident_expr.ml
&& 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 @@
+diff --git a/tools/http/http.ml b/tools/http/http.ml
+index a0018a3..70a1d04 100644
+--- a/tools/http/http.ml
++++ b/tools/http/http.ml
+@@ -71,8 +71,8 @@ module HTTP = struct
(* Scan past "\r\n\r\n" *)
let rec after_crlfcrlf result start =
let cr = String.index_from result start '\r' in
@@ -347,7 +395,7 @@ Index: galax-1.1/tools/http/http.ml
String.get result (cr+3) = '\n'
then cr+4
else after_crlfcrlf result (cr+1)
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ o=University%20of%20Michigan,c=US??sub?sn=john
let rec get_headers inchan =
try
let line = input_line inchan in
@@ -356,11 +404,11 @@ Index: galax-1.1/tools/http/http.ml
(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 @@
+diff --git a/tools/insert_variant b/tools/insert_variant
+index 27c16a0..480d5e8 100755
+--- a/tools/insert_variant
++++ b/tools/insert_variant
+@@ -72,7 +72,7 @@ let edit_file variant extension name =
while true do
let line = input_line chin in
(* We do not have Str here. *)
@@ -369,11 +417,11 @@ Index: galax-1.1/tools/insert_variant
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 @@
+diff --git a/tools/stemmer/stemmer.ml b/tools/stemmer/stemmer.ml
+index f246d0b..c171ea1 100644
+--- a/tools/stemmer/stemmer.ml
++++ b/tools/stemmer/stemmer.ml
+@@ -166,10 +166,10 @@ let word_size word =
let ends_with_cvc str =
let len = (String.length str) in
let vowel_or_y c =
@@ -386,10 +434,10 @@ Index: galax-1.1/tools/stemmer/stemmer.ml
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
+diff --git a/website/demo/.depend b/website/demo/.depend
+index 39ed920..f181034 100644
+--- a/website/demo/.depend
++++ b/website/demo/.depend
@@ -1,8 +1,8 @@
-demo_conf.cmo: demo_conf.cmi
-demo_conf.cmx: demo_conf.cmi
@@ -407,11 +455,11 @@ Index: galax-1.1/website/demo/.depend
+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 @@
+diff --git a/wsdl/wsdl_load.mlp b/wsdl/wsdl_load.mlp
+index b7378b9..eae2f20 100644
+--- a/wsdl/wsdl_load.mlp
++++ b/wsdl/wsdl_load.mlp
+@@ -236,7 +236,7 @@ let make_part att_el nsenv =
begin
match rattr_name rsym with _,_,name ->
if name = "name" then get_ntx (Some t) d rest
@@ -420,31 +468,3 @@ Index: galax-1.1/wsdl/wsdl_load.mlp
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/0010-Fix-space-tab-issue-in-some-Makefiles.patch b/debian/patches/0010-Fix-space-tab-issue-in-some-Makefiles.patch
index af94d59..b91b9d2 100644
--- a/debian/patches/0010-Fix-space-tab-issue-in-some-Makefiles.patch
+++ b/debian/patches/0010-Fix-space-tab-issue-in-some-Makefiles.patch
@@ -3,8 +3,8 @@ Date: Sat, 9 Aug 2014 13:59:40 +0200
Subject: Fix space/tab issue in some Makefiles
---
- tools/escaping/Makefile | 2 +-
- tools/ucs2_to_utf8/Makefile | 2 +-
+ tools/escaping/Makefile | 2 +-
+ tools/ucs2_to_utf8/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/escaping/Makefile b/tools/escaping/Makefile
@@ -33,4 +33,3 @@ index 6f0a28f..409fb60 100644
clobber::
$(RM) .depend
---
diff --git a/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch
index 417d561..c6b2bd6 100644
--- a/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch
+++ b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch
@@ -49,4 +49,3 @@ index 70a1d04..b5ef3da 100644
pipeline # add call;
pipeline#run();
match call#status with
---
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git
More information about the Pkg-ocaml-maint-commits
mailing list