[Pkg-ocaml-maint-commits] [SCM] xmlrpc-light packaging branch, master, updated. debian/0.6.1-2-3-g818317e

[Stephane Glondu]

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

    Fix build with ocamlnet 3.3.5 (non backward-compatible)

diff --git a/debian/control b/debian/control
index 4aaa890..0d557a1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  cdbs,
  debhelper (>= 7),
  ocaml-nox,
- libocamlnet-ocaml-dev,
+ libocamlnet-ocaml-dev (>= 3.3.5),
  libxml-light-ocaml-dev,
  libnethttpd-ocaml-dev,
  ocaml-findlib,
diff --git a/debian/patches/0002-Compile-with-ocamlnet-3.3.5.patch b/debian/patches/0002-Compile-with-ocamlnet-3.3.5.patch
new file mode 100644
index 0000000..8215812
--- /dev/null
+++ b/debian/patches/0002-Compile-with-ocamlnet-3.3.5.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 22 Jul 2011 00:32:59 +0200
+Subject: Compile with ocamlnet 3.3.5
+
+---
+ XmlRpcServer.ml |    8 +++-----
+ 1 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/XmlRpcServer.ml b/XmlRpcServer.ml
+index 3d4f130..47d6a8b 100644
+--- a/XmlRpcServer.ml
++++ b/XmlRpcServer.ml
+@@ -331,13 +331,11 @@ object (self)
+     Netcgi_cgi.run ~config ~output_type:(`Transactional buffered) self#process
+ end
+ 
+-open Netcgi1_compat
+-
+ class netplex ?(parallelizer=Netplex_mp.mp()) ?(handler="xmlrpc") () =
+ object (self)
+   inherit base
+ 
+-  method private process env (cgi : Netcgi_types.cgi_activation) =
++  method private process env (cgi : Netcgi.cgi_activation) =
+     match cgi#request_method with
+       | `POST ->
+           let input = cgi#argument_value "BODY" in
+@@ -377,8 +375,8 @@ object (self)
+       } in
+ 
+     let config_cgi =
+-      { Netcgi_env.default_config with
+-          Netcgi_env.permitted_input_content_types = [ "text/xml" ]
++      { Netcgi.default_config with
++          Netcgi.permitted_input_content_types = [ "text/xml" ]
+       } in
+ 
+     let handlers = [handler, xmlrpc] in
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2dba2ad..835c9a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Allow-installation-under-a-given-div-externally-pass.patch
+0002-Compile-with-ocamlnet-3.3.5.patch

-- 
xmlrpc-light packaging