From ea8f65018b75bf4669a2251ff191099b27d61de9 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 12:09:31 -0400
Subject: [PATCH 1/7] Switch to pa_*_conv packages

Like https://github.com/mirage/ocaml-conduit/pull/124
---
 .merlin | 4 ++--
 _oasis  | 4 ++--
 opam    | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.merlin b/.merlin
index 74ed42442b..f68f8af4e4 100644
--- a/.merlin
+++ b/.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
diff --git a/_oasis b/_oasis
index 489e6c8000..922d21dd6a 100644
--- a/_oasis
+++ b/_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.syntax,
+                 sexplib (>= 109.53.00), pa_sexp_conv.syntax,
                  bytes, base64 (>= 2.0.0)
   XMETARequires: re.emacs, stringext, uri, uri.services, fieldslib,
                  sexplib, bytes, base64
diff --git a/opam b/opam
index c06696a99d..e65f08e8ce 100644
--- a/opam
+++ b/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"}

From eef54ac3f0835c6e91a79ac2c60b984eccd17be4 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 12:09:46 -0400
Subject: [PATCH 2/7] regenerate oasis

---
 _tags    | 150 +++++++++++++++++++++++++++----------------------------
 setup.ml |   8 +--
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/_tags b/_tags
index a416b347d1..33e1b557bb 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 6cd0646d2278cea5898ace940b519331)
+# DO NOT EDIT (digest: 857ea16495a91eca273e6f9245533215)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -40,11 +40,11 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_base64
 <lib/*.ml{,i,y}>: pkg_bytes
 <lib/*.ml{,i,y}>: pkg_fieldslib
-<lib/*.ml{,i,y}>: pkg_fieldslib.syntax
 <lib/*.ml{,i,y}>: pkg_oUnit
+<lib/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<lib/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <lib/*.ml{,i,y}>: pkg_re.emacs
 <lib/*.ml{,i,y}>: pkg_sexplib
-<lib/*.ml{,i,y}>: pkg_sexplib.syntax
 <lib/*.ml{,i,y}>: pkg_stringext
 <lib/*.ml{,i,y}>: pkg_uri
 <lib/*.ml{,i,y}>: pkg_uri.services
@@ -57,11 +57,11 @@ true: annot, bin_annot
 <lwt-core/*.ml{,i,y}>: pkg_base64
 <lwt-core/*.ml{,i,y}>: pkg_bytes
 <lwt-core/*.ml{,i,y}>: pkg_fieldslib
-<lwt-core/*.ml{,i,y}>: pkg_fieldslib.syntax
 <lwt-core/*.ml{,i,y}>: pkg_lwt
+<lwt-core/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<lwt-core/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <lwt-core/*.ml{,i,y}>: pkg_re.emacs
 <lwt-core/*.ml{,i,y}>: pkg_sexplib
-<lwt-core/*.ml{,i,y}>: pkg_sexplib.syntax
 <lwt-core/*.ml{,i,y}>: pkg_stringext
 <lwt-core/*.ml{,i,y}>: pkg_uri
 <lwt-core/*.ml{,i,y}>: pkg_uri.services
@@ -73,13 +73,13 @@ true: annot, bin_annot
 <js/*.ml{,i,y}>: pkg_base64
 <js/*.ml{,i,y}>: pkg_bytes
 <js/*.ml{,i,y}>: pkg_fieldslib
-<js/*.ml{,i,y}>: pkg_fieldslib.syntax
 <js/*.ml{,i,y}>: pkg_js_of_ocaml
 <js/*.ml{,i,y}>: pkg_js_of_ocaml.syntax
 <js/*.ml{,i,y}>: pkg_lwt
+<js/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<js/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <js/*.ml{,i,y}>: pkg_re.emacs
 <js/*.ml{,i,y}>: pkg_sexplib
-<js/*.ml{,i,y}>: pkg_sexplib.syntax
 <js/*.ml{,i,y}>: pkg_stringext
 <js/*.ml{,i,y}>: pkg_uri
 <js/*.ml{,i,y}>: pkg_uri.services
@@ -93,14 +93,14 @@ true: annot, bin_annot
 <lwt/*.ml{,i,y}>: pkg_bytes
 <lwt/*.ml{,i,y}>: pkg_conduit.lwt-unix
 <lwt/*.ml{,i,y}>: pkg_fieldslib
-<lwt/*.ml{,i,y}>: pkg_fieldslib.syntax
 <lwt/*.ml{,i,y}>: pkg_lwt
 <lwt/*.ml{,i,y}>: pkg_lwt.unix
 <lwt/*.ml{,i,y}>: pkg_magic-mime
 <lwt/*.ml{,i,y}>: pkg_oUnit
+<lwt/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<lwt/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <lwt/*.ml{,i,y}>: pkg_re.emacs
 <lwt/*.ml{,i,y}>: pkg_sexplib
-<lwt/*.ml{,i,y}>: pkg_sexplib.syntax
 <lwt/*.ml{,i,y}>: pkg_stringext
 <lwt/*.ml{,i,y}>: pkg_unix
 <lwt/*.ml{,i,y}>: pkg_uri
@@ -116,12 +116,12 @@ true: annot, bin_annot
 <async/*.ml{,i,y}>: pkg_bytes
 <async/*.ml{,i,y}>: pkg_conduit.async
 <async/*.ml{,i,y}>: pkg_fieldslib
-<async/*.ml{,i,y}>: pkg_fieldslib.syntax
 <async/*.ml{,i,y}>: pkg_magic-mime
 <async/*.ml{,i,y}>: pkg_oUnit
+<async/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<async/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <async/*.ml{,i,y}>: pkg_re.emacs
 <async/*.ml{,i,y}>: pkg_sexplib
-<async/*.ml{,i,y}>: pkg_sexplib.syntax
 <async/*.ml{,i,y}>: pkg_stringext
 <async/*.ml{,i,y}>: pkg_threads
 <async/*.ml{,i,y}>: pkg_uri
@@ -134,14 +134,14 @@ true: annot, bin_annot
 <lib_test/test_parser.{native,byte}>: pkg_bytes
 <lib_test/test_parser.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_parser.{native,byte}>: pkg_fieldslib
-<lib_test/test_parser.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_parser.{native,byte}>: pkg_lwt
 <lib_test/test_parser.{native,byte}>: pkg_lwt.unix
 <lib_test/test_parser.{native,byte}>: pkg_magic-mime
 <lib_test/test_parser.{native,byte}>: pkg_oUnit
+<lib_test/test_parser.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_parser.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_parser.{native,byte}>: pkg_re.emacs
 <lib_test/test_parser.{native,byte}>: pkg_sexplib
-<lib_test/test_parser.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_parser.{native,byte}>: pkg_stringext
 <lib_test/test_parser.{native,byte}>: pkg_unix
 <lib_test/test_parser.{native,byte}>: pkg_uri
@@ -154,11 +154,11 @@ true: annot, bin_annot
 <lib_test/test_accept.{native,byte}>: pkg_base64
 <lib_test/test_accept.{native,byte}>: pkg_bytes
 <lib_test/test_accept.{native,byte}>: pkg_fieldslib
-<lib_test/test_accept.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_accept.{native,byte}>: pkg_oUnit
+<lib_test/test_accept.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_accept.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_accept.{native,byte}>: pkg_re.emacs
 <lib_test/test_accept.{native,byte}>: pkg_sexplib
-<lib_test/test_accept.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_accept.{native,byte}>: pkg_stringext
 <lib_test/test_accept.{native,byte}>: pkg_uri
 <lib_test/test_accept.{native,byte}>: pkg_uri.services
@@ -169,11 +169,11 @@ true: annot, bin_annot
 <lib_test/test_header.{native,byte}>: pkg_base64
 <lib_test/test_header.{native,byte}>: pkg_bytes
 <lib_test/test_header.{native,byte}>: pkg_fieldslib
-<lib_test/test_header.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_header.{native,byte}>: pkg_oUnit
+<lib_test/test_header.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_header.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_header.{native,byte}>: pkg_re.emacs
 <lib_test/test_header.{native,byte}>: pkg_sexplib
-<lib_test/test_header.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_header.{native,byte}>: pkg_stringext
 <lib_test/test_header.{native,byte}>: pkg_uri
 <lib_test/test_header.{native,byte}>: pkg_uri.services
@@ -184,11 +184,11 @@ true: annot, bin_annot
 <lib_test/test_request.{native,byte}>: pkg_base64
 <lib_test/test_request.{native,byte}>: pkg_bytes
 <lib_test/test_request.{native,byte}>: pkg_fieldslib
-<lib_test/test_request.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_request.{native,byte}>: pkg_oUnit
+<lib_test/test_request.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_request.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_request.{native,byte}>: pkg_re.emacs
 <lib_test/test_request.{native,byte}>: pkg_sexplib
-<lib_test/test_request.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_request.{native,byte}>: pkg_stringext
 <lib_test/test_request.{native,byte}>: pkg_uri
 <lib_test/test_request.{native,byte}>: pkg_uri.services
@@ -200,14 +200,14 @@ true: annot, bin_annot
 <lib_test/test_net_lwt.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_lwt.{native,byte}>: pkg_oUnit
+<lib_test/test_net_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt.{native,byte}>: pkg_uri
@@ -222,13 +222,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_google.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_google.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_uri
@@ -242,13 +242,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_uri
@@ -262,13 +262,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_uri
@@ -282,13 +282,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_server.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_server.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_uri
@@ -302,13 +302,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_uri
@@ -322,13 +322,13 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_bytes
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_magic-mime
+<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_sexplib
-<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_stringext
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_unix
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_uri
@@ -343,12 +343,12 @@ true: annot, bin_annot
 <lib_test/test_net_async.{native,byte}>: pkg_bytes
 <lib_test/test_net_async.{native,byte}>: pkg_conduit.async
 <lib_test/test_net_async.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_async.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_async.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async.{native,byte}>: pkg_oUnit
+<lib_test/test_net_async.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_async.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_async.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async.{native,byte}>: pkg_sexplib
-<lib_test/test_net_async.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_async.{native,byte}>: pkg_stringext
 <lib_test/test_net_async.{native,byte}>: pkg_threads
 <lib_test/test_net_async.{native,byte}>: pkg_uri
@@ -362,12 +362,12 @@ true: annot, bin_annot
 <lib_test/test_net_async_http10.{native,byte}>: pkg_bytes
 <lib_test/test_net_async_http10.{native,byte}>: pkg_conduit.async
 <lib_test/test_net_async_http10.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_async_http10.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_async_http10.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_http10.{native,byte}>: pkg_oUnit
+<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_async_http10.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_http10.{native,byte}>: pkg_sexplib
-<lib_test/test_net_async_http10.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_async_http10.{native,byte}>: pkg_stringext
 <lib_test/test_net_async_http10.{native,byte}>: pkg_threads
 <lib_test/test_net_async_http10.{native,byte}>: pkg_uri
@@ -381,12 +381,12 @@ true: annot, bin_annot
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_bytes
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_conduit.async
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_async_multi_get.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_oUnit
+<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_sexplib
-<lib_test/test_net_async_multi_get.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_stringext
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_threads
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_uri
@@ -400,12 +400,12 @@ true: annot, bin_annot
 <lib_test/test_net_async_server.{native,byte}>: pkg_bytes
 <lib_test/test_net_async_server.{native,byte}>: pkg_conduit.async
 <lib_test/test_net_async_server.{native,byte}>: pkg_fieldslib
-<lib_test/test_net_async_server.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_net_async_server.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_server.{native,byte}>: pkg_oUnit
+<lib_test/test_net_async_server.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_net_async_server.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_net_async_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_server.{native,byte}>: pkg_sexplib
-<lib_test/test_net_async_server.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_net_async_server.{native,byte}>: pkg_stringext
 <lib_test/test_net_async_server.{native,byte}>: pkg_threads
 <lib_test/test_net_async_server.{native,byte}>: pkg_uri
@@ -419,12 +419,12 @@ true: annot, bin_annot
 <lib_test/test_async_integration.{native,byte}>: pkg_bytes
 <lib_test/test_async_integration.{native,byte}>: pkg_conduit.async
 <lib_test/test_async_integration.{native,byte}>: pkg_fieldslib
-<lib_test/test_async_integration.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_async_integration.{native,byte}>: pkg_magic-mime
 <lib_test/test_async_integration.{native,byte}>: pkg_oUnit
+<lib_test/test_async_integration.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_async_integration.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_async_integration.{native,byte}>: pkg_re.emacs
 <lib_test/test_async_integration.{native,byte}>: pkg_sexplib
-<lib_test/test_async_integration.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_async_integration.{native,byte}>: pkg_stringext
 <lib_test/test_async_integration.{native,byte}>: pkg_threads
 <lib_test/test_async_integration.{native,byte}>: pkg_uri
@@ -445,11 +445,11 @@ true: annot, bin_annot
 <bin/cohttp_server_async.{native,byte}>: pkg_bytes
 <bin/cohttp_server_async.{native,byte}>: pkg_conduit.async
 <bin/cohttp_server_async.{native,byte}>: pkg_fieldslib
-<bin/cohttp_server_async.{native,byte}>: pkg_fieldslib.syntax
 <bin/cohttp_server_async.{native,byte}>: pkg_magic-mime
+<bin/cohttp_server_async.{native,byte}>: pkg_pa_fields_conv.syntax
+<bin/cohttp_server_async.{native,byte}>: pkg_pa_sexp_conv.syntax
 <bin/cohttp_server_async.{native,byte}>: pkg_re.emacs
 <bin/cohttp_server_async.{native,byte}>: pkg_sexplib
-<bin/cohttp_server_async.{native,byte}>: pkg_sexplib.syntax
 <bin/cohttp_server_async.{native,byte}>: pkg_stringext
 <bin/cohttp_server_async.{native,byte}>: pkg_threads
 <bin/cohttp_server_async.{native,byte}>: pkg_uri
@@ -463,11 +463,11 @@ true: annot, bin_annot
 <bin/cohttp_curl_async.{native,byte}>: pkg_bytes
 <bin/cohttp_curl_async.{native,byte}>: pkg_conduit.async
 <bin/cohttp_curl_async.{native,byte}>: pkg_fieldslib
-<bin/cohttp_curl_async.{native,byte}>: pkg_fieldslib.syntax
 <bin/cohttp_curl_async.{native,byte}>: pkg_magic-mime
+<bin/cohttp_curl_async.{native,byte}>: pkg_pa_fields_conv.syntax
+<bin/cohttp_curl_async.{native,byte}>: pkg_pa_sexp_conv.syntax
 <bin/cohttp_curl_async.{native,byte}>: pkg_re.emacs
 <bin/cohttp_curl_async.{native,byte}>: pkg_sexplib
-<bin/cohttp_curl_async.{native,byte}>: pkg_sexplib.syntax
 <bin/cohttp_curl_async.{native,byte}>: pkg_stringext
 <bin/cohttp_curl_async.{native,byte}>: pkg_threads
 <bin/cohttp_curl_async.{native,byte}>: pkg_uri
@@ -485,13 +485,13 @@ true: annot, bin_annot
 <bin/cohttp_server_lwt.{native,byte}>: pkg_cmdliner
 <bin/cohttp_server_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <bin/cohttp_server_lwt.{native,byte}>: pkg_fieldslib
-<bin/cohttp_server_lwt.{native,byte}>: pkg_fieldslib.syntax
 <bin/cohttp_server_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_server_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_server_lwt.{native,byte}>: pkg_magic-mime
+<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <bin/cohttp_server_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_server_lwt.{native,byte}>: pkg_sexplib
-<bin/cohttp_server_lwt.{native,byte}>: pkg_sexplib.syntax
 <bin/cohttp_server_lwt.{native,byte}>: pkg_stringext
 <bin/cohttp_server_lwt.{native,byte}>: pkg_unix
 <bin/cohttp_server_lwt.{native,byte}>: pkg_uri
@@ -506,13 +506,13 @@ true: annot, bin_annot
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_cmdliner
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_fieldslib
-<bin/cohttp_proxy_lwt.{native,byte}>: pkg_fieldslib.syntax
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_magic-mime
+<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_sexplib
-<bin/cohttp_proxy_lwt.{native,byte}>: pkg_sexplib.syntax
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_stringext
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_unix
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_uri
@@ -527,13 +527,13 @@ true: annot, bin_annot
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_cmdliner
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_fieldslib
-<bin/cohttp_curl_lwt.{native,byte}>: pkg_fieldslib.syntax
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_magic-mime
+<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_sexplib
-<bin/cohttp_curl_lwt.{native,byte}>: pkg_sexplib.syntax
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_stringext
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_unix
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_uri
@@ -546,13 +546,13 @@ true: annot, bin_annot
 <bin/*.ml{,i,y}>: pkg_cmdliner
 <bin/*.ml{,i,y}>: pkg_conduit.lwt-unix
 <bin/*.ml{,i,y}>: pkg_fieldslib
-<bin/*.ml{,i,y}>: pkg_fieldslib.syntax
 <bin/*.ml{,i,y}>: pkg_lwt
 <bin/*.ml{,i,y}>: pkg_lwt.unix
 <bin/*.ml{,i,y}>: pkg_magic-mime
+<bin/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<bin/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <bin/*.ml{,i,y}>: pkg_re.emacs
 <bin/*.ml{,i,y}>: pkg_sexplib
-<bin/*.ml{,i,y}>: pkg_sexplib.syntax
 <bin/*.ml{,i,y}>: pkg_stringext
 <bin/*.ml{,i,y}>: pkg_unix
 <bin/*.ml{,i,y}>: pkg_uri
@@ -567,11 +567,11 @@ true: annot, bin_annot
 <examples/async/hello_world.{native,byte}>: pkg_bytes
 <examples/async/hello_world.{native,byte}>: pkg_conduit.async
 <examples/async/hello_world.{native,byte}>: pkg_fieldslib
-<examples/async/hello_world.{native,byte}>: pkg_fieldslib.syntax
 <examples/async/hello_world.{native,byte}>: pkg_magic-mime
+<examples/async/hello_world.{native,byte}>: pkg_pa_fields_conv.syntax
+<examples/async/hello_world.{native,byte}>: pkg_pa_sexp_conv.syntax
 <examples/async/hello_world.{native,byte}>: pkg_re.emacs
 <examples/async/hello_world.{native,byte}>: pkg_sexplib
-<examples/async/hello_world.{native,byte}>: pkg_sexplib.syntax
 <examples/async/hello_world.{native,byte}>: pkg_stringext
 <examples/async/hello_world.{native,byte}>: pkg_threads
 <examples/async/hello_world.{native,byte}>: pkg_uri
@@ -586,12 +586,12 @@ true: annot, bin_annot
 <examples/async/s3_cp.{native,byte}>: pkg_conduit.async
 <examples/async/s3_cp.{native,byte}>: pkg_cstruct
 <examples/async/s3_cp.{native,byte}>: pkg_fieldslib
-<examples/async/s3_cp.{native,byte}>: pkg_fieldslib.syntax
 <examples/async/s3_cp.{native,byte}>: pkg_magic-mime
 <examples/async/s3_cp.{native,byte}>: pkg_nocrypto
+<examples/async/s3_cp.{native,byte}>: pkg_pa_fields_conv.syntax
+<examples/async/s3_cp.{native,byte}>: pkg_pa_sexp_conv.syntax
 <examples/async/s3_cp.{native,byte}>: pkg_re.emacs
 <examples/async/s3_cp.{native,byte}>: pkg_sexplib
-<examples/async/s3_cp.{native,byte}>: pkg_sexplib.syntax
 <examples/async/s3_cp.{native,byte}>: pkg_stringext
 <examples/async/s3_cp.{native,byte}>: pkg_threads
 <examples/async/s3_cp.{native,byte}>: pkg_uri
@@ -605,13 +605,13 @@ true: annot, bin_annot
 "lib_test/test_xhr.byte": pkg_base64
 "lib_test/test_xhr.byte": pkg_bytes
 "lib_test/test_xhr.byte": pkg_fieldslib
-"lib_test/test_xhr.byte": pkg_fieldslib.syntax
 "lib_test/test_xhr.byte": pkg_js_of_ocaml
 "lib_test/test_xhr.byte": pkg_js_of_ocaml.syntax
 "lib_test/test_xhr.byte": pkg_lwt
+"lib_test/test_xhr.byte": pkg_pa_fields_conv.syntax
+"lib_test/test_xhr.byte": pkg_pa_sexp_conv.syntax
 "lib_test/test_xhr.byte": pkg_re.emacs
 "lib_test/test_xhr.byte": pkg_sexplib
-"lib_test/test_xhr.byte": pkg_sexplib.syntax
 "lib_test/test_xhr.byte": pkg_stringext
 "lib_test/test_xhr.byte": pkg_uri
 "lib_test/test_xhr.byte": pkg_uri.services
@@ -628,11 +628,11 @@ true: annot, bin_annot
 <examples/async/receive_post.{native,byte}>: pkg_bytes
 <examples/async/receive_post.{native,byte}>: pkg_conduit.async
 <examples/async/receive_post.{native,byte}>: pkg_fieldslib
-<examples/async/receive_post.{native,byte}>: pkg_fieldslib.syntax
 <examples/async/receive_post.{native,byte}>: pkg_magic-mime
+<examples/async/receive_post.{native,byte}>: pkg_pa_fields_conv.syntax
+<examples/async/receive_post.{native,byte}>: pkg_pa_sexp_conv.syntax
 <examples/async/receive_post.{native,byte}>: pkg_re.emacs
 <examples/async/receive_post.{native,byte}>: pkg_sexplib
-<examples/async/receive_post.{native,byte}>: pkg_sexplib.syntax
 <examples/async/receive_post.{native,byte}>: pkg_stringext
 <examples/async/receive_post.{native,byte}>: pkg_threads
 <examples/async/receive_post.{native,byte}>: pkg_uri
@@ -644,11 +644,11 @@ true: annot, bin_annot
 <examples/async/*.ml{,i,y}>: pkg_bytes
 <examples/async/*.ml{,i,y}>: pkg_conduit.async
 <examples/async/*.ml{,i,y}>: pkg_fieldslib
-<examples/async/*.ml{,i,y}>: pkg_fieldslib.syntax
 <examples/async/*.ml{,i,y}>: pkg_magic-mime
+<examples/async/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<examples/async/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <examples/async/*.ml{,i,y}>: pkg_re.emacs
 <examples/async/*.ml{,i,y}>: pkg_sexplib
-<examples/async/*.ml{,i,y}>: pkg_sexplib.syntax
 <examples/async/*.ml{,i,y}>: pkg_stringext
 <examples/async/*.ml{,i,y}>: pkg_threads
 <examples/async/*.ml{,i,y}>: pkg_uri
@@ -661,13 +661,13 @@ true: annot, bin_annot
 <examples/doc/client_lwt.{native,byte}>: pkg_bytes
 <examples/doc/client_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <examples/doc/client_lwt.{native,byte}>: pkg_fieldslib
-<examples/doc/client_lwt.{native,byte}>: pkg_fieldslib.syntax
 <examples/doc/client_lwt.{native,byte}>: pkg_lwt
 <examples/doc/client_lwt.{native,byte}>: pkg_lwt.unix
 <examples/doc/client_lwt.{native,byte}>: pkg_magic-mime
+<examples/doc/client_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<examples/doc/client_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <examples/doc/client_lwt.{native,byte}>: pkg_re.emacs
 <examples/doc/client_lwt.{native,byte}>: pkg_sexplib
-<examples/doc/client_lwt.{native,byte}>: pkg_sexplib.syntax
 <examples/doc/client_lwt.{native,byte}>: pkg_stringext
 <examples/doc/client_lwt.{native,byte}>: pkg_unix
 <examples/doc/client_lwt.{native,byte}>: pkg_uri
@@ -681,13 +681,13 @@ true: annot, bin_annot
 <examples/doc/server_lwt.{native,byte}>: pkg_bytes
 <examples/doc/server_lwt.{native,byte}>: pkg_conduit.lwt-unix
 <examples/doc/server_lwt.{native,byte}>: pkg_fieldslib
-<examples/doc/server_lwt.{native,byte}>: pkg_fieldslib.syntax
 <examples/doc/server_lwt.{native,byte}>: pkg_lwt
 <examples/doc/server_lwt.{native,byte}>: pkg_lwt.unix
 <examples/doc/server_lwt.{native,byte}>: pkg_magic-mime
+<examples/doc/server_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
+<examples/doc/server_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
 <examples/doc/server_lwt.{native,byte}>: pkg_re.emacs
 <examples/doc/server_lwt.{native,byte}>: pkg_sexplib
-<examples/doc/server_lwt.{native,byte}>: pkg_sexplib.syntax
 <examples/doc/server_lwt.{native,byte}>: pkg_stringext
 <examples/doc/server_lwt.{native,byte}>: pkg_unix
 <examples/doc/server_lwt.{native,byte}>: pkg_uri
@@ -699,13 +699,13 @@ true: annot, bin_annot
 <examples/doc/*.ml{,i,y}>: pkg_bytes
 <examples/doc/*.ml{,i,y}>: pkg_conduit.lwt-unix
 <examples/doc/*.ml{,i,y}>: pkg_fieldslib
-<examples/doc/*.ml{,i,y}>: pkg_fieldslib.syntax
 <examples/doc/*.ml{,i,y}>: pkg_lwt
 <examples/doc/*.ml{,i,y}>: pkg_lwt.unix
 <examples/doc/*.ml{,i,y}>: pkg_magic-mime
+<examples/doc/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<examples/doc/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <examples/doc/*.ml{,i,y}>: pkg_re.emacs
 <examples/doc/*.ml{,i,y}>: pkg_sexplib
-<examples/doc/*.ml{,i,y}>: pkg_sexplib.syntax
 <examples/doc/*.ml{,i,y}>: pkg_stringext
 <examples/doc/*.ml{,i,y}>: pkg_unix
 <examples/doc/*.ml{,i,y}>: pkg_uri
@@ -719,14 +719,14 @@ true: annot, bin_annot
 <lib_test/test_sanity.{native,byte}>: pkg_bytes
 <lib_test/test_sanity.{native,byte}>: pkg_conduit.lwt-unix
 <lib_test/test_sanity.{native,byte}>: pkg_fieldslib
-<lib_test/test_sanity.{native,byte}>: pkg_fieldslib.syntax
 <lib_test/test_sanity.{native,byte}>: pkg_lwt
 <lib_test/test_sanity.{native,byte}>: pkg_lwt.unix
 <lib_test/test_sanity.{native,byte}>: pkg_magic-mime
 <lib_test/test_sanity.{native,byte}>: pkg_oUnit
+<lib_test/test_sanity.{native,byte}>: pkg_pa_fields_conv.syntax
+<lib_test/test_sanity.{native,byte}>: pkg_pa_sexp_conv.syntax
 <lib_test/test_sanity.{native,byte}>: pkg_re.emacs
 <lib_test/test_sanity.{native,byte}>: pkg_sexplib
-<lib_test/test_sanity.{native,byte}>: pkg_sexplib.syntax
 <lib_test/test_sanity.{native,byte}>: pkg_stringext
 <lib_test/test_sanity.{native,byte}>: pkg_unix
 <lib_test/test_sanity.{native,byte}>: pkg_uri
@@ -740,14 +740,14 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: pkg_bytes
 <lib_test/*.ml{,i,y}>: pkg_conduit.lwt-unix
 <lib_test/*.ml{,i,y}>: pkg_fieldslib
-<lib_test/*.ml{,i,y}>: pkg_fieldslib.syntax
 <lib_test/*.ml{,i,y}>: pkg_lwt
 <lib_test/*.ml{,i,y}>: pkg_lwt.unix
 <lib_test/*.ml{,i,y}>: pkg_magic-mime
 <lib_test/*.ml{,i,y}>: pkg_oUnit
+<lib_test/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
+<lib_test/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
 <lib_test/*.ml{,i,y}>: pkg_re.emacs
 <lib_test/*.ml{,i,y}>: pkg_sexplib
-<lib_test/*.ml{,i,y}>: pkg_sexplib.syntax
 <lib_test/*.ml{,i,y}>: pkg_stringext
 <lib_test/*.ml{,i,y}>: pkg_unix
 <lib_test/*.ml{,i,y}>: pkg_uri
diff --git a/setup.ml b/setup.ml
index 383767a0e5..edef5ce941 100644
--- a/setup.ml
+++ b/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: e5bb4aed034d200236cc53836a4c7a20) *)
 (*
    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.syntax", None);
                            FindlibPackage
                              ("sexplib",
                                Some (OASISVersion.VGreaterEqual "109.53.00"));
-                           FindlibPackage ("sexplib.syntax", None);
+                           FindlibPackage ("pa_sexp_conv.syntax", 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 "\139\138ôÆ\002\156Ü.>6ýÐ\147#\136|";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

From 687145b163d81df9ffa66c0bae7bb19d958d2df7 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 12:28:30 -0400
Subject: [PATCH 3/7] Update CHANGES

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index d6372b25cc..12c6758898 100644
--- a/CHANGES
+++ b/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)

From 7a3f5db8eb8a09d38eadb3b529ed18fed567e230 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 14:45:14 -0400
Subject: [PATCH 4/7] fixup _oasis

---
 _oasis | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_oasis b/_oasis
index 922d21dd6a..3924b972ac 100644
--- a/_oasis
+++ b/_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), pa_fields_conv.syntax,
-                 sexplib (>= 109.53.00), pa_sexp_conv.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

From caa1ad7b48cf99600fb12a6e79225a1116e54218 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 14:45:23 -0400
Subject: [PATCH 5/7] regen oasis

---
 _tags    | 150 +++++++++++++++++++++++++++----------------------------
 setup.ml |   8 +--
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/_tags b/_tags
index 33e1b557bb..a6783dc021 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 857ea16495a91eca273e6f9245533215)
+# DO NOT EDIT (digest: f6491da743f431d48323958ce13f300e)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -41,8 +41,8 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_bytes
 <lib/*.ml{,i,y}>: pkg_fieldslib
 <lib/*.ml{,i,y}>: pkg_oUnit
-<lib/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<lib/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<lib/*.ml{,i,y}>: pkg_pa_fields_conv
+<lib/*.ml{,i,y}>: pkg_pa_sexp_conv
 <lib/*.ml{,i,y}>: pkg_re.emacs
 <lib/*.ml{,i,y}>: pkg_sexplib
 <lib/*.ml{,i,y}>: pkg_stringext
@@ -58,8 +58,8 @@ true: annot, bin_annot
 <lwt-core/*.ml{,i,y}>: pkg_bytes
 <lwt-core/*.ml{,i,y}>: pkg_fieldslib
 <lwt-core/*.ml{,i,y}>: pkg_lwt
-<lwt-core/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<lwt-core/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<lwt-core/*.ml{,i,y}>: pkg_pa_fields_conv
+<lwt-core/*.ml{,i,y}>: pkg_pa_sexp_conv
 <lwt-core/*.ml{,i,y}>: pkg_re.emacs
 <lwt-core/*.ml{,i,y}>: pkg_sexplib
 <lwt-core/*.ml{,i,y}>: pkg_stringext
@@ -76,8 +76,8 @@ true: annot, bin_annot
 <js/*.ml{,i,y}>: pkg_js_of_ocaml
 <js/*.ml{,i,y}>: pkg_js_of_ocaml.syntax
 <js/*.ml{,i,y}>: pkg_lwt
-<js/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<js/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<js/*.ml{,i,y}>: pkg_pa_fields_conv
+<js/*.ml{,i,y}>: pkg_pa_sexp_conv
 <js/*.ml{,i,y}>: pkg_re.emacs
 <js/*.ml{,i,y}>: pkg_sexplib
 <js/*.ml{,i,y}>: pkg_stringext
@@ -97,8 +97,8 @@ true: annot, bin_annot
 <lwt/*.ml{,i,y}>: pkg_lwt.unix
 <lwt/*.ml{,i,y}>: pkg_magic-mime
 <lwt/*.ml{,i,y}>: pkg_oUnit
-<lwt/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<lwt/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<lwt/*.ml{,i,y}>: pkg_pa_fields_conv
+<lwt/*.ml{,i,y}>: pkg_pa_sexp_conv
 <lwt/*.ml{,i,y}>: pkg_re.emacs
 <lwt/*.ml{,i,y}>: pkg_sexplib
 <lwt/*.ml{,i,y}>: pkg_stringext
@@ -118,8 +118,8 @@ true: annot, bin_annot
 <async/*.ml{,i,y}>: pkg_fieldslib
 <async/*.ml{,i,y}>: pkg_magic-mime
 <async/*.ml{,i,y}>: pkg_oUnit
-<async/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<async/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<async/*.ml{,i,y}>: pkg_pa_fields_conv
+<async/*.ml{,i,y}>: pkg_pa_sexp_conv
 <async/*.ml{,i,y}>: pkg_re.emacs
 <async/*.ml{,i,y}>: pkg_sexplib
 <async/*.ml{,i,y}>: pkg_stringext
@@ -138,8 +138,8 @@ true: annot, bin_annot
 <lib_test/test_parser.{native,byte}>: pkg_lwt.unix
 <lib_test/test_parser.{native,byte}>: pkg_magic-mime
 <lib_test/test_parser.{native,byte}>: pkg_oUnit
-<lib_test/test_parser.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_parser.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_parser.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_parser.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_parser.{native,byte}>: pkg_re.emacs
 <lib_test/test_parser.{native,byte}>: pkg_sexplib
 <lib_test/test_parser.{native,byte}>: pkg_stringext
@@ -155,8 +155,8 @@ true: annot, bin_annot
 <lib_test/test_accept.{native,byte}>: pkg_bytes
 <lib_test/test_accept.{native,byte}>: pkg_fieldslib
 <lib_test/test_accept.{native,byte}>: pkg_oUnit
-<lib_test/test_accept.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_accept.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_accept.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_accept.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_accept.{native,byte}>: pkg_re.emacs
 <lib_test/test_accept.{native,byte}>: pkg_sexplib
 <lib_test/test_accept.{native,byte}>: pkg_stringext
@@ -170,8 +170,8 @@ true: annot, bin_annot
 <lib_test/test_header.{native,byte}>: pkg_bytes
 <lib_test/test_header.{native,byte}>: pkg_fieldslib
 <lib_test/test_header.{native,byte}>: pkg_oUnit
-<lib_test/test_header.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_header.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_header.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_header.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_header.{native,byte}>: pkg_re.emacs
 <lib_test/test_header.{native,byte}>: pkg_sexplib
 <lib_test/test_header.{native,byte}>: pkg_stringext
@@ -185,8 +185,8 @@ true: annot, bin_annot
 <lib_test/test_request.{native,byte}>: pkg_bytes
 <lib_test/test_request.{native,byte}>: pkg_fieldslib
 <lib_test/test_request.{native,byte}>: pkg_oUnit
-<lib_test/test_request.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_request.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_request.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_request.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_request.{native,byte}>: pkg_re.emacs
 <lib_test/test_request.{native,byte}>: pkg_sexplib
 <lib_test/test_request.{native,byte}>: pkg_stringext
@@ -204,8 +204,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_lwt.{native,byte}>: pkg_oUnit
-<lib_test/test_net_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt.{native,byte}>: pkg_stringext
@@ -225,8 +225,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_google.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_google.{native,byte}>: pkg_stringext
@@ -245,8 +245,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_google_custom_ctx.{native,byte}>: pkg_stringext
@@ -265,8 +265,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_stringext
@@ -285,8 +285,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_server.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_server.{native,byte}>: pkg_stringext
@@ -305,8 +305,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_stringext
@@ -325,8 +325,8 @@ true: annot, bin_annot
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt.unix
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_magic-mime
-<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_sexplib
 <lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_stringext
@@ -345,8 +345,8 @@ true: annot, bin_annot
 <lib_test/test_net_async.{native,byte}>: pkg_fieldslib
 <lib_test/test_net_async.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async.{native,byte}>: pkg_oUnit
-<lib_test/test_net_async.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_async.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_async.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_async.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_async.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async.{native,byte}>: pkg_sexplib
 <lib_test/test_net_async.{native,byte}>: pkg_stringext
@@ -364,8 +364,8 @@ true: annot, bin_annot
 <lib_test/test_net_async_http10.{native,byte}>: pkg_fieldslib
 <lib_test/test_net_async_http10.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_http10.{native,byte}>: pkg_oUnit
-<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_async_http10.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_async_http10.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_http10.{native,byte}>: pkg_sexplib
 <lib_test/test_net_async_http10.{native,byte}>: pkg_stringext
@@ -383,8 +383,8 @@ true: annot, bin_annot
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_fieldslib
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_oUnit
-<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_async_multi_get.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_sexplib
 <lib_test/test_net_async_multi_get.{native,byte}>: pkg_stringext
@@ -402,8 +402,8 @@ true: annot, bin_annot
 <lib_test/test_net_async_server.{native,byte}>: pkg_fieldslib
 <lib_test/test_net_async_server.{native,byte}>: pkg_magic-mime
 <lib_test/test_net_async_server.{native,byte}>: pkg_oUnit
-<lib_test/test_net_async_server.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_net_async_server.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_net_async_server.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_net_async_server.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_net_async_server.{native,byte}>: pkg_re.emacs
 <lib_test/test_net_async_server.{native,byte}>: pkg_sexplib
 <lib_test/test_net_async_server.{native,byte}>: pkg_stringext
@@ -421,8 +421,8 @@ true: annot, bin_annot
 <lib_test/test_async_integration.{native,byte}>: pkg_fieldslib
 <lib_test/test_async_integration.{native,byte}>: pkg_magic-mime
 <lib_test/test_async_integration.{native,byte}>: pkg_oUnit
-<lib_test/test_async_integration.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_async_integration.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_async_integration.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_async_integration.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_async_integration.{native,byte}>: pkg_re.emacs
 <lib_test/test_async_integration.{native,byte}>: pkg_sexplib
 <lib_test/test_async_integration.{native,byte}>: pkg_stringext
@@ -446,8 +446,8 @@ true: annot, bin_annot
 <bin/cohttp_server_async.{native,byte}>: pkg_conduit.async
 <bin/cohttp_server_async.{native,byte}>: pkg_fieldslib
 <bin/cohttp_server_async.{native,byte}>: pkg_magic-mime
-<bin/cohttp_server_async.{native,byte}>: pkg_pa_fields_conv.syntax
-<bin/cohttp_server_async.{native,byte}>: pkg_pa_sexp_conv.syntax
+<bin/cohttp_server_async.{native,byte}>: pkg_pa_fields_conv
+<bin/cohttp_server_async.{native,byte}>: pkg_pa_sexp_conv
 <bin/cohttp_server_async.{native,byte}>: pkg_re.emacs
 <bin/cohttp_server_async.{native,byte}>: pkg_sexplib
 <bin/cohttp_server_async.{native,byte}>: pkg_stringext
@@ -464,8 +464,8 @@ true: annot, bin_annot
 <bin/cohttp_curl_async.{native,byte}>: pkg_conduit.async
 <bin/cohttp_curl_async.{native,byte}>: pkg_fieldslib
 <bin/cohttp_curl_async.{native,byte}>: pkg_magic-mime
-<bin/cohttp_curl_async.{native,byte}>: pkg_pa_fields_conv.syntax
-<bin/cohttp_curl_async.{native,byte}>: pkg_pa_sexp_conv.syntax
+<bin/cohttp_curl_async.{native,byte}>: pkg_pa_fields_conv
+<bin/cohttp_curl_async.{native,byte}>: pkg_pa_sexp_conv
 <bin/cohttp_curl_async.{native,byte}>: pkg_re.emacs
 <bin/cohttp_curl_async.{native,byte}>: pkg_sexplib
 <bin/cohttp_curl_async.{native,byte}>: pkg_stringext
@@ -488,8 +488,8 @@ true: annot, bin_annot
 <bin/cohttp_server_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_server_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_server_lwt.{native,byte}>: pkg_magic-mime
-<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_fields_conv
+<bin/cohttp_server_lwt.{native,byte}>: pkg_pa_sexp_conv
 <bin/cohttp_server_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_server_lwt.{native,byte}>: pkg_sexplib
 <bin/cohttp_server_lwt.{native,byte}>: pkg_stringext
@@ -509,8 +509,8 @@ true: annot, bin_annot
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_magic-mime
-<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_fields_conv
+<bin/cohttp_proxy_lwt.{native,byte}>: pkg_pa_sexp_conv
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_sexplib
 <bin/cohttp_proxy_lwt.{native,byte}>: pkg_stringext
@@ -530,8 +530,8 @@ true: annot, bin_annot
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_lwt
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_lwt.unix
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_magic-mime
-<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_fields_conv
+<bin/cohttp_curl_lwt.{native,byte}>: pkg_pa_sexp_conv
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_re.emacs
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_sexplib
 <bin/cohttp_curl_lwt.{native,byte}>: pkg_stringext
@@ -549,8 +549,8 @@ true: annot, bin_annot
 <bin/*.ml{,i,y}>: pkg_lwt
 <bin/*.ml{,i,y}>: pkg_lwt.unix
 <bin/*.ml{,i,y}>: pkg_magic-mime
-<bin/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<bin/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<bin/*.ml{,i,y}>: pkg_pa_fields_conv
+<bin/*.ml{,i,y}>: pkg_pa_sexp_conv
 <bin/*.ml{,i,y}>: pkg_re.emacs
 <bin/*.ml{,i,y}>: pkg_sexplib
 <bin/*.ml{,i,y}>: pkg_stringext
@@ -568,8 +568,8 @@ true: annot, bin_annot
 <examples/async/hello_world.{native,byte}>: pkg_conduit.async
 <examples/async/hello_world.{native,byte}>: pkg_fieldslib
 <examples/async/hello_world.{native,byte}>: pkg_magic-mime
-<examples/async/hello_world.{native,byte}>: pkg_pa_fields_conv.syntax
-<examples/async/hello_world.{native,byte}>: pkg_pa_sexp_conv.syntax
+<examples/async/hello_world.{native,byte}>: pkg_pa_fields_conv
+<examples/async/hello_world.{native,byte}>: pkg_pa_sexp_conv
 <examples/async/hello_world.{native,byte}>: pkg_re.emacs
 <examples/async/hello_world.{native,byte}>: pkg_sexplib
 <examples/async/hello_world.{native,byte}>: pkg_stringext
@@ -588,8 +588,8 @@ true: annot, bin_annot
 <examples/async/s3_cp.{native,byte}>: pkg_fieldslib
 <examples/async/s3_cp.{native,byte}>: pkg_magic-mime
 <examples/async/s3_cp.{native,byte}>: pkg_nocrypto
-<examples/async/s3_cp.{native,byte}>: pkg_pa_fields_conv.syntax
-<examples/async/s3_cp.{native,byte}>: pkg_pa_sexp_conv.syntax
+<examples/async/s3_cp.{native,byte}>: pkg_pa_fields_conv
+<examples/async/s3_cp.{native,byte}>: pkg_pa_sexp_conv
 <examples/async/s3_cp.{native,byte}>: pkg_re.emacs
 <examples/async/s3_cp.{native,byte}>: pkg_sexplib
 <examples/async/s3_cp.{native,byte}>: pkg_stringext
@@ -608,8 +608,8 @@ true: annot, bin_annot
 "lib_test/test_xhr.byte": pkg_js_of_ocaml
 "lib_test/test_xhr.byte": pkg_js_of_ocaml.syntax
 "lib_test/test_xhr.byte": pkg_lwt
-"lib_test/test_xhr.byte": pkg_pa_fields_conv.syntax
-"lib_test/test_xhr.byte": pkg_pa_sexp_conv.syntax
+"lib_test/test_xhr.byte": pkg_pa_fields_conv
+"lib_test/test_xhr.byte": pkg_pa_sexp_conv
 "lib_test/test_xhr.byte": pkg_re.emacs
 "lib_test/test_xhr.byte": pkg_sexplib
 "lib_test/test_xhr.byte": pkg_stringext
@@ -629,8 +629,8 @@ true: annot, bin_annot
 <examples/async/receive_post.{native,byte}>: pkg_conduit.async
 <examples/async/receive_post.{native,byte}>: pkg_fieldslib
 <examples/async/receive_post.{native,byte}>: pkg_magic-mime
-<examples/async/receive_post.{native,byte}>: pkg_pa_fields_conv.syntax
-<examples/async/receive_post.{native,byte}>: pkg_pa_sexp_conv.syntax
+<examples/async/receive_post.{native,byte}>: pkg_pa_fields_conv
+<examples/async/receive_post.{native,byte}>: pkg_pa_sexp_conv
 <examples/async/receive_post.{native,byte}>: pkg_re.emacs
 <examples/async/receive_post.{native,byte}>: pkg_sexplib
 <examples/async/receive_post.{native,byte}>: pkg_stringext
@@ -645,8 +645,8 @@ true: annot, bin_annot
 <examples/async/*.ml{,i,y}>: pkg_conduit.async
 <examples/async/*.ml{,i,y}>: pkg_fieldslib
 <examples/async/*.ml{,i,y}>: pkg_magic-mime
-<examples/async/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<examples/async/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<examples/async/*.ml{,i,y}>: pkg_pa_fields_conv
+<examples/async/*.ml{,i,y}>: pkg_pa_sexp_conv
 <examples/async/*.ml{,i,y}>: pkg_re.emacs
 <examples/async/*.ml{,i,y}>: pkg_sexplib
 <examples/async/*.ml{,i,y}>: pkg_stringext
@@ -664,8 +664,8 @@ true: annot, bin_annot
 <examples/doc/client_lwt.{native,byte}>: pkg_lwt
 <examples/doc/client_lwt.{native,byte}>: pkg_lwt.unix
 <examples/doc/client_lwt.{native,byte}>: pkg_magic-mime
-<examples/doc/client_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<examples/doc/client_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<examples/doc/client_lwt.{native,byte}>: pkg_pa_fields_conv
+<examples/doc/client_lwt.{native,byte}>: pkg_pa_sexp_conv
 <examples/doc/client_lwt.{native,byte}>: pkg_re.emacs
 <examples/doc/client_lwt.{native,byte}>: pkg_sexplib
 <examples/doc/client_lwt.{native,byte}>: pkg_stringext
@@ -684,8 +684,8 @@ true: annot, bin_annot
 <examples/doc/server_lwt.{native,byte}>: pkg_lwt
 <examples/doc/server_lwt.{native,byte}>: pkg_lwt.unix
 <examples/doc/server_lwt.{native,byte}>: pkg_magic-mime
-<examples/doc/server_lwt.{native,byte}>: pkg_pa_fields_conv.syntax
-<examples/doc/server_lwt.{native,byte}>: pkg_pa_sexp_conv.syntax
+<examples/doc/server_lwt.{native,byte}>: pkg_pa_fields_conv
+<examples/doc/server_lwt.{native,byte}>: pkg_pa_sexp_conv
 <examples/doc/server_lwt.{native,byte}>: pkg_re.emacs
 <examples/doc/server_lwt.{native,byte}>: pkg_sexplib
 <examples/doc/server_lwt.{native,byte}>: pkg_stringext
@@ -702,8 +702,8 @@ true: annot, bin_annot
 <examples/doc/*.ml{,i,y}>: pkg_lwt
 <examples/doc/*.ml{,i,y}>: pkg_lwt.unix
 <examples/doc/*.ml{,i,y}>: pkg_magic-mime
-<examples/doc/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<examples/doc/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<examples/doc/*.ml{,i,y}>: pkg_pa_fields_conv
+<examples/doc/*.ml{,i,y}>: pkg_pa_sexp_conv
 <examples/doc/*.ml{,i,y}>: pkg_re.emacs
 <examples/doc/*.ml{,i,y}>: pkg_sexplib
 <examples/doc/*.ml{,i,y}>: pkg_stringext
@@ -723,8 +723,8 @@ true: annot, bin_annot
 <lib_test/test_sanity.{native,byte}>: pkg_lwt.unix
 <lib_test/test_sanity.{native,byte}>: pkg_magic-mime
 <lib_test/test_sanity.{native,byte}>: pkg_oUnit
-<lib_test/test_sanity.{native,byte}>: pkg_pa_fields_conv.syntax
-<lib_test/test_sanity.{native,byte}>: pkg_pa_sexp_conv.syntax
+<lib_test/test_sanity.{native,byte}>: pkg_pa_fields_conv
+<lib_test/test_sanity.{native,byte}>: pkg_pa_sexp_conv
 <lib_test/test_sanity.{native,byte}>: pkg_re.emacs
 <lib_test/test_sanity.{native,byte}>: pkg_sexplib
 <lib_test/test_sanity.{native,byte}>: pkg_stringext
@@ -744,8 +744,8 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: pkg_lwt.unix
 <lib_test/*.ml{,i,y}>: pkg_magic-mime
 <lib_test/*.ml{,i,y}>: pkg_oUnit
-<lib_test/*.ml{,i,y}>: pkg_pa_fields_conv.syntax
-<lib_test/*.ml{,i,y}>: pkg_pa_sexp_conv.syntax
+<lib_test/*.ml{,i,y}>: pkg_pa_fields_conv
+<lib_test/*.ml{,i,y}>: pkg_pa_sexp_conv
 <lib_test/*.ml{,i,y}>: pkg_re.emacs
 <lib_test/*.ml{,i,y}>: pkg_sexplib
 <lib_test/*.ml{,i,y}>: pkg_stringext
diff --git a/setup.ml b/setup.ml
index edef5ce941..24ddf73918 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e5bb4aed034d200236cc53836a4c7a20) *)
+(* 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 ("pa_fields_conv.syntax", None);
+                           FindlibPackage ("pa_fields_conv", None);
                            FindlibPackage
                              ("sexplib",
                                Some (OASISVersion.VGreaterEqual "109.53.00"));
-                           FindlibPackage ("pa_sexp_conv.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 "\139\138ôÆ\002\156Ü.>6ýÐ\147#\136|";
+     oasis_digest = Some " &\130Ò\tó_¸\031Eð\029W#\157ò";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

From b5f5455bdda21ef254d2f274e258f53707a95373 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 17:18:54 -0400
Subject: [PATCH 6/7] brain dead work around for pa_*_conv

oasis uses a limited heuristic to identify whether we need to enable
camlp4. It's roughly the following:
* Pacakge is in a hard coded list of camlp4 identified packages
* Package ends with .syntax

We hack the hard coded list in point 1 and insert px_{sexp,conv}_conv in
there. This is dumb but will removed once we switch to ppx
---
 myocamlbuild.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 0f016188e3..c20d18e954 100644
--- a/myocamlbuild.ml
+++ b/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"
   ]
 
 

From 6e64ba506c252f5d1ad7da5a45de1bd8703bd8c4 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 25 Mar 2016 18:07:30 -0400
Subject: [PATCH 7/7] Drop 4.01 support

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 65eef56251..46e7e75828 100644
--- a/.travis.yml
+++ b/.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: