tags 731584 + pending patch thanks Le 07/12/2013 08:26, Stéphane Glondu a écrit : > sks FTBFS when binNMUed against ocaml 4.01.0. > [...]
I've just uploaded to DELAYED/3 the attached NMU. Cheers, -- Stéphane
From 989962d5ba3a6f8529caf905402d9270761b77dd Mon Sep 17 00:00:00 2001 From: Stephane Glondu <st...@glondu.net> Date: Tue, 10 Dec 2013 07:13:34 +0100 Subject: [PATCH] Fix compilation with OCaml 4.01.0 (Closes: #731584) --- debian/changelog | 7 +++++++ debian/patches/100_deprecated_operators.patch | 29 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/100_deprecated_operators.patch diff --git a/debian/changelog b/debian/changelog index 116cd85..6ff1089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sks (1.1.4-2.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix compilation with OCaml 4.01.0 (Closes: #731584) + + -- Stéphane Glondu <glo...@debian.org> Tue, 10 Dec 2013 07:18:02 +0100 + sks (1.1.4-2) unstable; urgency=low * move to unstable diff --git a/debian/patches/100_deprecated_operators.patch b/debian/patches/100_deprecated_operators.patch new file mode 100644 index 0000000..4e5c39d --- /dev/null +++ b/debian/patches/100_deprecated_operators.patch @@ -0,0 +1,29 @@ +Description: Do not use operators deprecated in OCaml 4.01.0 + +Author: Stéphane Glondu <glo...@debian.org> +Bug-Debian: http://bugs.debian.org/731584 +Forwarded: no +Last-Update: 2013-12-10 + +--- sks-1.1.4.orig/prime.ml ++++ sks-1.1.4/prime.ml +@@ -87,7 +87,7 @@ let miller_rabin rfunc n t = + let test () = + let a = randrange rfunc two (n -! one) in + let y = Number.powmod a r n in +- if y =! one or y =! neg_one then Prime ++ if y =! one || y =! neg_one then Prime + else + let rec loop y j = + if y =! neg_one then Prime +--- sks-1.1.4.orig/mArray.ml ++++ sks-1.1.4/mArray.ml +@@ -57,7 +57,7 @@ let for_all ~f:test array = + Array.fold_left ~f:(fun a b -> a && (test b)) ~init:true array + + let exists ~f:test array = +- Array.fold_left ~f:(fun a b -> a or (test b)) ~init:false array ++ Array.fold_left ~f:(fun a b -> a || (test b)) ~init:false array + + let mem el array = + let length = Array.length array in diff --git a/debian/patches/series b/debian/patches/series index 8eb0702..dd42af4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 500_debian_fhs.patch 501_makefile_cflags.patch 502_makefile_install.patch +100_deprecated_operators.patch -- 1.8.5.1