Bug#731398: galax: FTBFS with ocaml 4.01.0

2014-01-31 Thread Andreas Moog
Control: tags -1 patch

Hi there,

please find attached a patch from upstream that fixes the build against
ocaml 4.01. Since I'm not a DD, I can't upload myself.

Cheers,
  Andreas
-- 
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624
diff -Nru galax-1.1/debian/changelog galax-1.1/debian/changelog
--- galax-1.1/debian/changelog  2011-11-11 00:42:50.0 +0100
+++ galax-1.1/debian/changelog  2014-01-31 15:59:05.0 +0100
@@ -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 -Nru galax-1.1/debian/patches/0009-Fix-build-with-ocaml-4.01.patch 
galax-1.1/debian/patches/0009-Fix-build-with-ocaml-4.01.patch
--- galax-1.1/debian/patches/0009-Fix-build-with-ocaml-4.01.patch   
1970-01-01 01:00:00.0 +0100
+++ galax-1.1/debian/patches/0009-Fix-build-with-ocaml-4.01.patch   
2014-01-31 15:58:28.0 +0100
@@ -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.0 +0100
 galax-1.1/base/finfo.ml2014-01-31 14:53:51.0 +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.0 +0100
 galax-1.1/code_selection/code/code_fn.ml   2014-01-31 14:53:51.0 
+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.0 
+0100
 galax-1.1/config/Makefile.galax-inst   2014-01-31 14:53:51.0 
+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.0 +0100
 galax-1.1/configure2014-01-31 14:53:51.0 +0100
+@@ -18,7 +18,7 @@
+ # value2: 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=
+@@ 

Bug#636019: Bug#731398: galax: FTBFS with ocaml 4.01.0

2014-01-31 Thread Stéphane Glondu
Control: tags 731398 + pending

Le 31/01/2014 16:26, Andreas Moog a écrit :
 please find attached a patch from upstream that fixes the build against
 ocaml 4.01. Since I'm not a DD, I can't upload myself.

Thanks for that. I've applied it in git... but do you know if upstream
is planning to make a new release soon? Patches are accumulating in the
Debian package, and many of them are there just to make it compile with
current libraries.

By the way, do you use galax and if so, would you like to officially
take care of it? It has had no human maintainers for more than two
years, now. I've been the only one taking care of it lately, and I don't
even use it. Actually, I was planning to have it removed from Debian...

Cheers,

-- 
Stéphane


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#636019: Bug#731398: galax: FTBFS with ocaml 4.01.0

2014-01-31 Thread Andreas Moog
On 31.01.2014 18:47, Stéphane Glondu wrote:

 Thanks for that. I've applied it in git... but do you know if upstream
 is planning to make a new release soon?

Aside from reporting this build failure, I'm not in contact with
upstream, so I can't say, sorry.

 By the way, do you use galax and if so, would you like to officially
 take care of it?

I don't use galax and for that reason wouldn't be a good choice for
maintainership, I was just looking for RC bugs to fix/forward upstream.

Cheers,
  Andreas

-- 
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624



signature.asc
Description: OpenPGP digital signature


Bug#731398: galax: FTBFS with ocaml 4.01.0

2013-12-04 Thread Stéphane Glondu
Source: galax
Version: 1.1-10
Severity: serious
Tags: jessie sid
Control: block 718767 with -1

Hi,

galax FTBFS when binNMUed against ocaml 4.01.0.

From the amd64 build log:
 File datatypes/dateTime.ml, line 196, characters 20-22:
 Warning 3: deprecated feature: operator (or); you should use (||) instead
 File datatypes/dateTime.ml, line 185, characters 43-45:
 Warning 3: deprecated feature: operator (or); you should use (||) instead
 /usr/bin/ocamlc  -w m -I . -I . -I /usr/bin/../lib/ocaml -I 
 /usr/lib/ocaml/pcre -I /usr/lib/ocaml/netstring -I /usr/lib/ocaml/equeue -I 
 /usr/lib/ocaml/netclient -I /usr/lib/ocaml/pxp-engine -I 
 /usr/lib/ocaml/pxp-lex-utf8 -I /usr/lib/ocaml/pxp-lex-iso88591 -I 
 /usr/lib/ocaml/camomile -I /usr/lib/ocaml/netsys  -I ./tools/http -I 
 ./tools/stemmer -I ./base -I ./fsa -I ./namespace -I ./datatypes -I ./ast -I 
 ./ast_walker -I ./ast_printer -I ./procctxt -I ./lexing -I ./parsing -I 
 ./dm/base -I ./dm/atomic -I ./streaming -I ./serialization -I ./schema -I 
 ./dm -I ./subtyping -I ./wsdl -I ./normalization -I ./projection -I 
 ./code_util -I ./streaming_xpath -I ./datamodel -I ./monitor -I ./stdlib -I 
 ./typing -I ./rewriting -I ./factorization -I ./physicaldm -I ./compile -I 
 ./optimization -I ./code_selection/code -I ./code_selection -I ./planio -I 
 ./evaluation -I ./procmod -I ./toplevel -I ./galapi/caml_api -I 
 ./extensions/jabber -I ./extensions/apache -I ./shredded -I 
 ./shredded/shredded_main_mem
ory -I ./shredded/shredded_common -I ./regress -c datatypes/anyURI.mli
 /usr/bin/ocamlc  -w m -I . -I . -I /usr/bin/../lib/ocaml -I 
 /usr/lib/ocaml/pcre -I /usr/lib/ocaml/netstring -I /usr/lib/ocaml/equeue -I 
 /usr/lib/ocaml/netclient -I /usr/lib/ocaml/pxp-engine -I 
 /usr/lib/ocaml/pxp-lex-utf8 -I /usr/lib/ocaml/pxp-lex-iso88591 -I 
 /usr/lib/ocaml/camomile -I /usr/lib/ocaml/netsys  -I ./tools/http -I 
 ./tools/stemmer -I ./base -I ./fsa -I ./namespace -I ./datatypes -I ./ast -I 
 ./ast_walker -I ./ast_printer -I ./procctxt -I ./lexing -I ./parsing -I 
 ./dm/base -I ./dm/atomic -I ./streaming -I ./serialization -I ./schema -I 
 ./dm -I ./subtyping -I ./wsdl -I ./normalization -I ./projection -I 
 ./code_util -I ./streaming_xpath -I ./datamodel -I ./monitor -I ./stdlib -I 
 ./typing -I ./rewriting -I ./factorization -I ./physicaldm -I ./compile -I 
 ./optimization -I ./code_selection/code -I ./code_selection -I ./planio -I 
 ./evaluation -I ./procmod -I ./toplevel -I ./galapi/caml_api -I 
 ./extensions/jabber -I ./extensions/apache -I ./shredded -I 
 ./shredded/shredded_main_mem
ory -I ./shredded/shredded_common -I ./regress -c datatypes/anyURI.ml
 File datatypes/anyURI.ml, line 142, characters 2-23:
 Error: Unbound module Netstring_pcre
 make[3]: *** [datatypes/anyURI.cmo] Error 2
 make[2]: make[3]: Leaving directory `/«PKGBUILDDIR»'
 *** [world] Error 2
 make[2]: Leaving directory `/«PKGBUILDDIR»'
 make[1]: *** [override_dh_auto_build] Error 2
 make[1]: Leaving directory `/«PKGBUILDDIR»'
 make: *** [build-arch] Error 2

Full build logs available via:

  https://buildd.debian.org/status/package.php?p=galaxsuite=sid


Cheers,

-- 
Stéphane


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org