Switch to pa_*_conv packages

.merlin

@@ -20,9 +20,9 @@ PKG re
 PKG re.emacs
 PKG stringext
 PKG fieldslib
-PKG fieldslib.syntax
+PKG pa_fields_conv
 PKG sexplib
-PKG sexplib.syntax
+PKG pa_sexp_conv
 PKG ipaddr
 PKG ipaddr.unix
 PKG conduit

.travis.yml

@@ -2,7 +2,6 @@ language: c
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
 script: bash -ex .travis-opam.sh
 env:
-  - PACKAGE="cohttp" OCAML_VERSION=4.01   DEPOPTS="async lwt js_of_ocaml" POST_INSTALL_HOOK="opam install github cowabloga" 
   - PACKAGE="cohttp" OCAML_VERSION=latest DEPOPTS="async lwt js_of_ocaml" POST_INSTALL_HOOK="opam install github cowabloga opium slacko"
   - PACKAGE="cohttp" OCAML_VERSION=latest DEPOPTS="async_ssl" POST_INSTALL_HOOK="opam install github cowabloga"
 notifications:

CHANGES

@@ -1,3 +1,6 @@
+0.19.4 (2016-03-25)
+* Switch to pa_fields_conv and pa_sexp_conv for camlp4 extensions
+
 0.19.3 (2015-09-28):
 * Support Async 113.00 by explicitly using the blocking Core `printf` (#431)
 * cohttp_curl_async: add `-data-binary` to send POST data. (#425)

_oasis

@@ -29,8 +29,8 @@ Library cohttp
                  Accept, Accept_parser, Accept_lexer, Accept_types, Link,
                  Auth, Header_io, Transfer_io, Connection, Body, String_io, Conf
   BuildDepends:  re.emacs, stringext, uri (>= 1.5.0), uri.services,
-                 fieldslib (>= 109.20.00), fieldslib.syntax,
-                 sexplib (>= 109.53.00), sexplib.syntax,
+                 fieldslib (>= 109.20.00), pa_fields_conv,
+                 sexplib (>= 109.53.00), pa_sexp_conv,
                  bytes, base64 (>= 2.0.0)
   XMETARequires: re.emacs, stringext, uri, uri.services, fieldslib,
                  sexplib, bytes, base64

myocamlbuild.ml

@@ -337,7 +337,9 @@ module MyOCamlbuildFindlib = struct
     "camlp4.mapgenerator";
     "camlp4.metagenerator";
     "camlp4.profiler";
-    "camlp4.tracer"
+    "camlp4.tracer";
+    "pa_sexp_conv";
+    "pa_fields_conv"
   ]
 
 

opam

@@ -29,8 +29,11 @@ depends: [
   "cmdliner" {build & >= "0.9.4"}
   "re"
   "uri" {>= "1.9.0"}
-  "fieldslib" {>= "109.20.00"}
-  "sexplib" {>= "109.53.00"}
+  "fieldslib"
+  "sexplib"
+  "type_conv"
+  "pa_sexp_conv"
+  "pa_fields_conv"
   "conduit" {>= "0.11.0"}
   "stringext"
   "base64" {>= "2.0.0"}

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 30301e2efbaf4c256d48471e2910193c) *)
+(* DO NOT EDIT (digest: 2cb6a7924af84800b46bb9b07e32ab93) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7095,11 +7095,11 @@ let setup_t =
                            FindlibPackage
                              ("fieldslib",
                                Some (OASISVersion.VGreaterEqual "109.20.00"));
-                           FindlibPackage ("fieldslib.syntax", None);
+                           FindlibPackage ("pa_fields_conv", None);
                            FindlibPackage
                              ("sexplib",
                                Some (OASISVersion.VGreaterEqual "109.53.00"));
-                           FindlibPackage ("sexplib.syntax", None);
+                           FindlibPackage ("pa_sexp_conv", None);
                            FindlibPackage ("bytes", None);
                            FindlibPackage
                              ("base64",
@@ -8890,7 +8890,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "ܢ�E˵\003\130�\021�%C:&�";
+     oasis_digest = Some " &\130�\t�_�\031E�\029W#\157�";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false