diff -Nru ocaml-http-0.1.5/debian/changelog ocaml-http-0.1.5/debian/changelog --- ocaml-http-0.1.5/debian/changelog 2019-08-21 17:02:43.000000000 +0000 +++ ocaml-http-0.1.5/debian/changelog 2019-09-05 11:54:20.000000000 +0000 @@ -1,98 +1,10 @@ -ocaml-http (0.1.5-1build16) eoan; urgency=medium +ocaml-http (0.1.5-2) unstable; urgency=medium - * Rebuild against new OCAML ABIs. + * Team upload + * Update Vcs-* + * Fix compilation with OCaml 4.08.0 - -- Gianfranco Costamagna Wed, 21 Aug 2019 19:02:43 +0200 - -ocaml-http (0.1.5-1build15) eoan; urgency=medium - - * Rebuild against new OCAML ABIs. - - -- Gianfranco Costamagna Tue, 13 Aug 2019 08:29:55 +0200 - -ocaml-http (0.1.5-1build14) eoan; urgency=medium - - * Rebuild against new OCAML ABIs. - - -- Gianfranco Costamagna Mon, 05 Aug 2019 14:51:53 +0200 - -ocaml-http (0.1.5-1build13) eoan; urgency=medium - - * Rebuild against new OCAML ABIs. - - -- Gianfranco Costamagna Wed, 24 Jul 2019 23:27:57 +0200 - -ocaml-http (0.1.5-1build12) bionic; urgency=medium - - * Rebuild against new OCAML ABIs. - - -- Gianfranco Costamagna Sat, 28 Oct 2017 16:40:27 +0200 - -ocaml-http (0.1.5-1build11) artful; urgency=high - - * No change rebuild against new ocaml abis. - - -- Dimitri John Ledkov Thu, 31 Aug 2017 02:11:25 +0100 - -ocaml-http (0.1.5-1build10) artful; urgency=high - - * No change rebuild against ocamlnet. - - -- Dimitri John Ledkov Mon, 10 Jul 2017 14:13:31 +0100 - -ocaml-http (0.1.5-1build9) artful; urgency=high - - * No change rebuild against ocaml 4.04. - - -- Dimitri John Ledkov Mon, 03 Jul 2017 01:29:43 +0100 - -ocaml-http (0.1.5-1build8) zesty; urgency=medium - - * Rebuild against new OCaml ABI. - - -- Gianfranco Costamagna Wed, 21 Dec 2016 20:33:35 +0100 - -ocaml-http (0.1.5-1build7) yakkety; urgency=medium - - * No-change rebuild for ocaml ABIs. - - -- Matthias Klose Fri, 02 Sep 2016 12:10:51 +0000 - -ocaml-http (0.1.5-1build6) xenial; urgency=medium - - * No-change rebuild against ocaml 4.02. - - -- Łukasz 'sil2100' Zemczak Wed, 04 Nov 2015 21:37:49 -0600 - -ocaml-http (0.1.5-1build5) xenial; urgency=medium - - * No-change rebuild against the new ocamlnet. - - -- Łukasz 'sil2100' Zemczak Thu, 29 Oct 2015 18:33:18 +0100 - -ocaml-http (0.1.5-1build4) wily; urgency=medium - - * No-change ocaml rebuild. - - -- Matthias Klose Tue, 01 Sep 2015 11:57:13 +0000 - -ocaml-http (0.1.5-1build3) trusty; urgency=medium - - * Rebuild for ocaml-4.01. - - -- Matthias Klose Mon, 23 Dec 2013 22:02:05 +0000 - -ocaml-http (0.1.5-1build2) saucy; urgency=low - - * Rebuild for new OCaml ABIs. - - -- Colin Watson Thu, 09 May 2013 18:06:25 +0100 - -ocaml-http (0.1.5-1build1) quantal; urgency=low - - * No-change rebuild with current OCaml. - - -- Michael Bienia Thu, 17 May 2012 19:46:43 +0200 + -- Stéphane Glondu Thu, 05 Sep 2019 13:54:20 +0200 ocaml-http (0.1.5-1) unstable; urgency=low diff -Nru ocaml-http-0.1.5/debian/control ocaml-http-0.1.5/debian/control --- ocaml-http-0.1.5/debian/control 2017-07-03 00:29:43.000000000 +0000 +++ ocaml-http-0.1.5/debian/control 2019-09-05 11:54:20.000000000 +0000 @@ -1,8 +1,7 @@ Source: ocaml-http Section: ocaml Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OCaml Maintainers +Maintainer: Debian OCaml Maintainers Build-Depends: debhelper (>= 8), cdbs, @@ -13,8 +12,8 @@ libpcre-ocaml-dev, libocamlnet-ocaml-dev (>= 2.2.9-6) Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-http.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-http.git +Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-http.git +Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-http Homepage: http://ocaml-http.forge.ocamlcore.org/ Package: libhttp-ocaml-dev diff -Nru ocaml-http-0.1.5/debian/patches/0001-Fix-compilation-with-OCaml-4.08.0.patch ocaml-http-0.1.5/debian/patches/0001-Fix-compilation-with-OCaml-4.08.0.patch --- ocaml-http-0.1.5/debian/patches/0001-Fix-compilation-with-OCaml-4.08.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ ocaml-http-0.1.5/debian/patches/0001-Fix-compilation-with-OCaml-4.08.0.patch 2019-09-05 11:54:20.000000000 +0000 @@ -0,0 +1,85 @@ +From: Stephane Glondu +Date: Thu, 5 Sep 2019 13:52:20 +0200 +Subject: Fix compilation with OCaml 4.08.0 + +--- + http_daemon.ml | 2 +- + http_misc.ml | 6 +++--- + http_user_agent.ml | 4 ++-- + http_user_agent.mli | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/http_daemon.ml b/http_daemon.ml +index 0eb4ba5..6a4bfed 100644 +--- a/http_daemon.ml ++++ b/http_daemon.ml +@@ -142,7 +142,7 @@ let respond_unauthorized ?version ?(realm = server_string) outchan = + + let send_file ~src outchan = + let buflen = 1024 in +- let buf = String.make buflen ' ' in ++ let buf = Bytes.make buflen ' ' in + + let (file, cleanup) = + match src with +diff --git a/http_misc.ml b/http_misc.ml +index daa81f3..91c4139 100644 +--- a/http_misc.ml ++++ b/http_misc.ml +@@ -119,19 +119,19 @@ let sockname_of_in_channel inchan = + + let buf_of_inchan ?limit ic = + let buf = Buffer.create 10240 in +- let tmp = String.make 1024 '\000' in ++ let tmp = Bytes.make 1024 '\000' in + let rec buf_of_inchan' limit = + (match limit with + | None -> + let bytes = input ic tmp 0 1024 in + if bytes > 0 then begin +- Buffer.add_substring buf tmp 0 bytes; ++ Buffer.add_subbytes buf tmp 0 bytes; + buf_of_inchan' None + end + | Some lim -> (* TODO what about using a single really_input call? *) + let bytes = input ic tmp 0 (min lim 1024) in + if bytes > 0 then begin +- Buffer.add_substring buf tmp 0 bytes; ++ Buffer.add_subbytes buf tmp 0 bytes; + buf_of_inchan' (Some (lim - bytes)) + end) + in +diff --git a/http_user_agent.ml b/http_user_agent.ml +index f5317d6..e59730d 100644 +--- a/http_user_agent.ml ++++ b/http_user_agent.ml +@@ -87,7 +87,7 @@ let get_iter ?(head_callback = fun _ _ -> ()) callback url = + | bytes when bytes = tcp_bufsiz -> (* buffer full, no need to slice it *) + callback buf + | bytes when bytes < tcp_bufsiz -> (* buffer not full, slice it *) +- callback (String.sub buf 0 bytes) ++ callback (Bytes.sub buf 0 bytes) + | _ -> (* ( bytes < 0 ) || ( bytes > tcp_bufsiz ) *) + assert false + done +@@ -96,6 +96,6 @@ let get_iter ?(head_callback = fun _ _ -> ()) callback url = + + let get ?head_callback url = + let buf = Buffer.create 10240 in +- get_iter ?head_callback (Buffer.add_string buf) url; ++ get_iter ?head_callback (Buffer.add_bytes buf) url; + Buffer.contents buf + +diff --git a/http_user_agent.mli b/http_user_agent.mli +index 79f2d69..09e6d8a 100644 +--- a/http_user_agent.mli ++++ b/http_user_agent.mli +@@ -43,7 +43,7 @@ val get: + * returning it as a string *) + val get_iter: + ?head_callback:(status -> (string * string) list -> unit) -> +- (string -> unit) -> string -> ++ (bytes -> unit) -> string -> + unit + + (** @param url an HTTP url diff -Nru ocaml-http-0.1.5/debian/patches/series ocaml-http-0.1.5/debian/patches/series --- ocaml-http-0.1.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ocaml-http-0.1.5/debian/patches/series 2019-09-05 11:54:20.000000000 +0000 @@ -0,0 +1 @@ +0001-Fix-compilation-with-OCaml-4.08.0.patch