diff -Nru approx-5.8/debian/changelog approx-5.8/debian/changelog --- approx-5.8/debian/changelog 2017-07-07 15:28:16.000000000 +0000 +++ approx-5.8/debian/changelog 2017-07-10 11:50:29.000000000 +0000 @@ -1,3 +1,9 @@ +approx (5.8-1ubuntu2) artful; urgency=medium + + * Fix up ftbfs with ocaml 4.04. + + -- Dimitri John Ledkov Mon, 10 Jul 2017 12:50:18 +0100 + approx (5.8-1ubuntu1) artful; urgency=medium * Fix ftbfs with ocaml 4.04. diff -Nru approx-5.8/debian/patches/fix-ftbfs.patch approx-5.8/debian/patches/fix-ftbfs.patch --- approx-5.8/debian/patches/fix-ftbfs.patch 2017-07-07 15:28:33.000000000 +0000 +++ approx-5.8/debian/patches/fix-ftbfs.patch 2017-07-10 11:50:13.000000000 +0000 @@ -23,6 +23,8 @@ Reviewed-By: Last-Update: +Index: approx-5.8/approx.ml +=================================================================== --- approx-5.8.orig/approx.ml +++ approx-5.8/approx.ml @@ -280,7 +280,7 @@ let process_header resp str = @@ -34,6 +36,8 @@ | "content-length" -> (try resp.length <- Int64.of_string value with Failure _ -> +Index: approx-5.8/config_file.ml +=================================================================== --- approx-5.8.orig/config_file.ml +++ approx-5.8/config_file.ml @@ -40,7 +40,7 @@ let get = get_generic (fun x -> x) @@ -45,6 +49,8 @@ | "true" | "yes" | "on" | "1" -> true | "false" | "no" | "off" | "0" -> false | _ -> failwith ("not a boolean value: " ^ str) +Index: approx-5.8/control_file.ml +=================================================================== --- approx-5.8.orig/control_file.ml +++ approx-5.8/control_file.ml @@ -43,7 +43,7 @@ let parse line = @@ -56,6 +62,8 @@ in let info = substring line ~from: (trim_left line (i + 1)) +Index: approx-5.8/log.ml +=================================================================== --- approx-5.8.orig/log.ml +++ approx-5.8/log.ml @@ -14,7 +14,7 @@ let log_to_stderr () = @@ -67,6 +75,8 @@ | "authpriv" -> `Authpriv | "cron" -> `Cron | "daemon" -> `Daemon +Index: approx-5.8/url.ml +=================================================================== --- approx-5.8.orig/url.ml +++ approx-5.8/url.ml @@ -40,7 +40,7 @@ type protocol = HTTP | HTTPS | FTP | FIL @@ -87,3 +97,16 @@ | "" | "none" | "unlimited" -> "" | str -> "--limit-rate " ^ str +Index: approx-5.8/program.ml +=================================================================== +--- approx-5.8.orig/program.ml ++++ approx-5.8/program.ml +@@ -20,7 +20,7 @@ let string_of_exception exc = + sprintf "File %s, line %d: missing \"%s\" field" + (Control_file.file_name par) + (Control_file.line_number par) +- (String.capitalize field) ++ (String.capitalize_ascii field) + | e -> Printexc.to_string e + + let perform f x =