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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ae3fe0e28ebd0ea22a562d197c3dd43997fbf124
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 22 09:18:01 2011 +0200

    Fix build with ocamlnet 3.3.5 (not backward-compatible)

diff --git a/debian/control b/debian/control
index 696ed7c..a48d023 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  autotools-dev,
  camlp4,
  libpcre-ocaml-dev,
- libocamlnet-ocaml-dev (>= 2.2.9-6~),
+ libocamlnet-ocaml-dev (>= 3.3.5),
  libpxp-ocaml-dev (>= 1.2.1-1~),
  libcamomile-ocaml-dev,
  hevea,
diff --git a/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
new file mode 100644
index 0000000..b40130d
--- /dev/null
+++ b/debian/patches/0006-Compile-with-ocamlnet-3.3.5.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 22 Jul 2011 09:17:18 +0200
+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(-)
+
+diff --git a/config/Makefile.galax b/config/Makefile.galax
+index f465ace..7c0bdb0 100644
+--- a/config/Makefile.galax
++++ b/config/Makefile.galax
+@@ -1254,7 +1254,7 @@ str.cma \
+ bigarray.cma \
+ pcre.cma 
+ ifeq ($(CONF_WITH_NETSYS), true)
+-OCAML_LIBS+=netsys.cma 
++OCAML_LIBS+=netsys_oothr.cma netsys.cma
+ endif
+ OCAML_LIBS+=\
+ netstring.cma \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 02b4ec6..41987cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-port-code-to-build-against-PXP-1.2.patch
 0004-fix-syntax-errors-in-ocamldoc-tags.patch
 0005-Fix-some-typos.patch
+0006-Compile-with-ocamlnet-3.3.5.patch

-- 
galax packaging