This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository galax.
commit 3d2d4037f739ba17792b179afe774a5b4d49f2ce Author: Mehdi Dogguy <me...@debian.org> Date: Sat Oct 17 00:34:26 2015 +0200 Port to ocamlnet 4.0.4 --- debian/changelog | 6 +++ debian/control | 2 +- .../patches/0011-Compile-with-ocamlnet-4.0.4.patch | 52 ++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95b720c..8a8759d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +galax (1.1-13) UNRELEASED; urgency=medium + + * Port to ocamlnet 4.0.4 + + -- Mehdi Dogguy <me...@debian.org> Sat, 17 Oct 2015 00:33:18 +0200 + galax (1.1-12) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 309e085..9230988 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: autotools-dev, camlp4, libpcre-ocaml-dev, - libocamlnet-ocaml-dev (>= 3.3.5), + libocamlnet-ocaml-dev (>= 4.0.4), libpxp-ocaml-dev (>= 1.2.1-1~), libcamomile-ocaml-dev, hevea, diff --git a/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch new file mode 100644 index 0000000..417d561 --- /dev/null +++ b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch @@ -0,0 +1,52 @@ +From: Mehdi Dogguy <me...@debian.org> +Date: Sat, 17 Oct 2015 00:32:56 +0200 +Subject: Compile with ocamlnet 4.0.4 + +--- + configure | 6 +++--- + tools/http/http.ml | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index b513732..0d34b39 100755 +--- a/configure ++++ b/configure +@@ -725,7 +725,7 @@ fi + printf "%s" "Checking for OCaml netclient library... " + if [ -z "$ocaml_netclient" ] + then +- if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/netclient" -a -f "$ocaml_pkglib/netclient/http_client.cmi" ] ++ if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/netclient" -a -f "$ocaml_pkglib/netclient/nethttp_client.cmi" ] + then + ocaml_netclient="$ocaml_pkglib/netclient" + elif [ -n "$tool_ocamlfind" ] +@@ -733,11 +733,11 @@ then + ocaml_netclient=`$tool_ocamlfind query netclient 2>/dev/null` + fi + fi +-if [ -n "$ocaml_netclient" -a -f "$ocaml_netclient/http_client.cmi" ] ++if [ -n "$ocaml_netclient" -a -f "$ocaml_netclient/nethttp_client.cmi" ] + then + echo "found" + else +- echo "ERROR: unable to find http_client.cmi in $ocaml_netclient" ++ echo "ERROR: unable to find nethttp_client.cmi in $ocaml_netclient" + exit 1 + fi + +diff --git a/tools/http/http.ml b/tools/http/http.ml +index 70a1d04..b5ef3da 100644 +--- a/tools/http/http.ml ++++ b/tools/http/http.ml +@@ -165,8 +165,8 @@ module HTTP = struct + process_response result + + let get url = +- let call = new Http_client.get url in +- let pipeline = new Http_client.pipeline in ++ let call = new Nethttp_client.get url in ++ let pipeline = new Nethttp_client.pipeline in + pipeline # add call; + pipeline#run(); + match call#status with +-- diff --git a/debian/patches/series b/debian/patches/series index 3ef7f8d..4ed8acf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 0008-Fix-configure-for-hurd.patch 0009-Fix-build-with-ocaml-4.01.patch 0010-Fix-space-tab-issue-in-some-Makefiles.patch +0011-Compile-with-ocamlnet-4.0.4.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits