[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-7-8-gf4d43ea

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 81f1e1374ba18e38f51c9eab9d17da7d19c1a133
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 24 00:06:39 2011 +0200

    Complete fix build with ocamlnet 3.3.5

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 b40130d..477f5bc 100644
--- a/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
+++ b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
@@ -4,11 +4,11 @@ Subject: Compile with ocamlnet 3.3.5
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
- config/Makefile.galax |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ config/Makefile.galax |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/Makefile.galax b/config/Makefile.galax
-index f465ace..7c0bdb0 100644
+index f465ace..391b5d4 100644
 --- a/config/Makefile.galax
 +++ b/config/Makefile.galax
 @@ -1254,7 +1254,7 @@ str.cma \
@@ -20,4 +20,13 @@ index f465ace..7c0bdb0 100644
  endif
  OCAML_LIBS+=\
  netstring.cma \
+@@ -1288,7 +1288,7 @@ str.cmxa \
+ bigarray.cmxa \
+ pcre.cmxa 
+ ifeq ($(CONF_WITH_NETSYS), true)
+-OCAML_OPTLIBS+=netsys.cmxa 
++OCAML_OPTLIBS+=netsys_oothr.cmxa netsys.cmxa
+ endif
+ OCAML_OPTLIBS+=\
+ netstring.cmxa \
 -- 

-- 
galax packaging