diff -Nru pagodacf-0.10/cf_tai64n_p.c pagodacf-0.10/cf_tai64n_p.c --- pagodacf-0.10/cf_tai64n_p.c 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/cf_tai64n_p.c 2006-03-11 18:58:09.000000000 +0000 @@ -88,7 +88,7 @@ vPtr = Cf_tai64n_val(v); - CAMLreturn((uint32_t) vPtr->s ^ vPtr->ns); + CAMLreturn((uint32) vPtr->s ^ vPtr->ns); } static void cf_tai64n_op_serialize @@ -98,7 +98,7 @@ char buffer[12]; unsigned long long x; - uint32_t y; + uint32 y; int i; x = Cf_tai64n_val(v)->s; @@ -126,7 +126,7 @@ { char buffer[12]; unsigned long long x; - uint32_t y; + uint32 y; int i; deserialize_block_1(buffer, 8); @@ -182,7 +182,7 @@ ---*/ extern void cf_tai64n_update(Cf_tai64n_t* tai64nPtr) { - uint64_t epoch; + uint64 epoch; struct timeval tv; struct timezone tz; @@ -191,7 +191,7 @@ epoch = CF_TAI64_EPOCH; epoch += cf_tai64_current_offset; - tai64nPtr->s = epoch + ((uint64_t) tv.tv_sec); + tai64nPtr->s = epoch + ((uint64) tv.tv_sec); tai64nPtr->ns = tv.tv_usec * 1000; } @@ -238,11 +238,11 @@ CAMLlocal1(resultVal); Cf_tai64_t* tai64Ptr; - uint32_t ns; + uint32 ns; Cf_tai64n_t tai64n; tai64Ptr = Cf_tai64_val(tai64Val); - ns = (uint32_t) Int_val(nsVal); + ns = (uint32) Int_val(nsVal); if (ns < 0 || ns > 999999999) INVALID_ARGUMENT("compose: ns > 10^9"); tai64n.s = tai64Ptr->s; @@ -287,13 +287,13 @@ Cf_tai64n_t tai64n; double x, y; - y = (uint64_t) modf(Double_val(v), &x); + y = (uint64) modf(Double_val(v), &x); x += (double) cf_tai64_current_offset; if (x < cf_tai64_unix_limit[0] || x > cf_tai64_unix_limit[1]) cf_tai64_range_error(); - tai64n.s = CF_TAI64_EPOCH + ((uint64_t) x); - tai64n.ns = (uint32_t) (y * 1E9); + tai64n.s = CF_TAI64_EPOCH + ((uint64) x); + tai64n.ns = (uint32) (y * 1E9); result = cf_tai64n_alloc(&tai64n); CAMLreturn(result); @@ -308,7 +308,7 @@ CAMLlocal1(result); double x, y; - uint64_t epoch; + uint64 epoch; epoch = CF_TAI64_EPOCH; epoch += cf_tai64_current_offset; @@ -331,8 +331,8 @@ Cf_tai64n_t tai64n; int i; - uint64_t x; - uint32_t y; + uint64 x; + uint32 y; if (string_length(v) != 12) cf_tai64_label_error(); for (i = 0, x = 0; i < 8; ++i) x = (x << 8) | Byte_u(v, i); @@ -352,8 +352,8 @@ CAMLparam1(v); CAMLlocal1(result); - uint64_t x; - uint32_t y; + uint64 x; + uint32 y; int i; result = alloc_string(12); @@ -377,12 +377,12 @@ Cf_tai64n_t tai64n; double zInt, zFrac; - int64_t x; - int32_t y; + int64 x; + int32 y; zFrac = modf(Double_val(dtVal), &zInt); - x = (int64_t) zInt; - y = (int32_t) (zFrac * 1E9); + x = (int64) zInt; + y = (int32) (zFrac * 1E9); tai64n.s = Cf_tai64n_val(tai64nVal)->s + x; tai64n.ns = Cf_tai64n_val(tai64nVal)->ns + y; @@ -409,8 +409,8 @@ CAMLlocal1(resultVal); double dt; - dt = ((int64_t) Cf_tai64n_val(v1)->s) - ((int64_t) Cf_tai64n_val(v2)->s); - dt += (((int32_t) Cf_tai64n_val(v1)->ns) - ((int32_t) Cf_tai64n_val(v2)->ns)) + dt = ((int64) Cf_tai64n_val(v1)->s) - ((int64) Cf_tai64n_val(v2)->s); + dt += (((int32) Cf_tai64n_val(v1)->ns) - ((int32) Cf_tai64n_val(v2)->ns)) * 1E-9; resultVal = copy_double(dt); diff -Nru pagodacf-0.10/cf_tai64n_p.h pagodacf-0.10/cf_tai64n_p.h --- pagodacf-0.10/cf_tai64n_p.h 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/cf_tai64n_p.h 2006-03-11 18:58:09.000000000 +0000 @@ -35,7 +35,7 @@ #include "cf_tai64_p.h" -struct cf_tai64n_s { uint64_t s; uint32_t ns; }; +struct cf_tai64n_s { uint64 s; uint32 ns; }; typedef struct cf_tai64n_s Cf_tai64n_t; #define Cf_tai64n_val(v) ((Cf_tai64n_t*) Data_custom_val(v)) diff -Nru pagodacf-0.10/cf_tai64_p.c pagodacf-0.10/cf_tai64_p.c --- pagodacf-0.10/cf_tai64_p.c 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/cf_tai64_p.c 2007-09-19 04:09:47.000000000 +0000 @@ -200,11 +200,11 @@ ---*/ extern void cf_tai64_update(Cf_tai64_t* tai64Ptr) { - uint64_t epoch; + uint64 epoch; epoch = CF_TAI64_EPOCH; epoch += cf_tai64_current_offset; - tai64Ptr->s = epoch + ((uint64_t) time(0)); + tai64Ptr->s = epoch + ((uint64) time(0)); } /*--- @@ -290,7 +290,7 @@ if (x < cf_tai64_unix_limit[0] || x > cf_tai64_unix_limit[1]) cf_tai64_range_error(); - tai64.s = CF_TAI64_EPOCH + ((int64_t) x); + tai64.s = CF_TAI64_EPOCH + ((int64) x); result = cf_tai64_alloc(&tai64); CAMLreturn(result); @@ -305,7 +305,7 @@ CAMLlocal1(result); double x; - uint64_t epoch; + uint64 epoch; epoch = CF_TAI64_EPOCH; epoch += cf_tai64_current_offset; @@ -326,7 +326,7 @@ Cf_tai64_t tai64; int i; - uint64_t x; + uint64 x; if (string_length(v) != 8) cf_tai64_label_error(); for (i = 0, x = 0; i < 8; ++i) x = (x << 8) | Byte_u(v, i); @@ -344,7 +344,7 @@ CAMLparam1(v); CAMLlocal1(result); - uint64_t x; + uint64 x; int i; result = alloc_string(8); @@ -390,7 +390,7 @@ } /*--- - Addition of int64_t + Addition of int64 ---*/ CAMLprim value cf_tai64_add_int64(value tai64Val, value dt64Val) { @@ -398,7 +398,7 @@ CAMLlocal1(result); Cf_tai64_t x; - int64_t dt64; + int64 dt64; dt64 = Int64_val(dt64Val); if (dt64 >= (CF_TAI64_EPOCH << 1)) cf_tai64_range_error(); @@ -417,7 +417,7 @@ { CAMLparam2(v1, v2); - int64_t dt; + int64 dt; dt = Cf_tai64_val(v1)->s - Cf_tai64_val(v2)->s; CAMLreturn(copy_int64(dt)); diff -Nru pagodacf-0.10/cf_tai64_p.h pagodacf-0.10/cf_tai64_p.h --- pagodacf-0.10/cf_tai64_p.h 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/cf_tai64_p.h 2006-03-11 18:58:09.000000000 +0000 @@ -43,7 +43,7 @@ #define CF_TAI64_EPOCH 0x4000000000000000ULL #define CF_TAI64_MJD_EPOCH 0x3fffffff2efbbf8aULL -struct cf_tai64_s { uint64_t s; }; +struct cf_tai64_s { uint64 s; }; typedef struct cf_tai64_s Cf_tai64_t; #define Cf_tai64_val(v) ((Cf_tai64_t*) Data_custom_val(v)) diff -Nru pagodacf-0.10/debian/changelog pagodacf-0.10/debian/changelog --- pagodacf-0.10/debian/changelog 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/changelog 2017-07-19 08:54:15.000000000 +0000 @@ -1,50 +1,18 @@ -pagodacf (0.10-3ubuntu1) artful; urgency=medium +pagodacf (0.10-4) unstable; urgency=low - * Fix ftbfs with ocaml 4.04. - - -- Dimitri John Ledkov Fri, 07 Jul 2017 16:01:45 +0100 - -pagodacf (0.10-3build7) xenial; urgency=medium - - * No-change rebuild against ocaml 4.02. - - -- Łukasz 'sil2100' Zemczak Tue, 03 Nov 2015 15:01:57 -0600 - -pagodacf (0.10-3build6) trusty; urgency=medium - - * Rebuild for ocaml-4.01. - - -- Matthias Klose Mon, 23 Dec 2013 16:18:11 +0000 - -pagodacf (0.10-3build5) precise; urgency=low - - * Rebuild with ocamlopt on armhf. - - -- Colin Watson Tue, 24 Jan 2012 10:52:05 +0000 + [ Stéphane Glondu ] + * Team upload + * Switch source package format to 3.0 (quilt) + * Update Vcs-* + * Bump debhelper compat to 10 -pagodacf (0.10-3build4) precise; urgency=low + [ Sylvain Le Gall ] + * Remove Sylvain Le Gall from uploaders - * Rebuild for OCaml 3.12.1. - - -- Colin Watson Sat, 19 Nov 2011 00:59:59 +0000 - -pagodacf (0.10-3build3) oneiric; urgency=low - - * Rebuild to pick up ocaml fixes on armel. - - -- Adam Conrad Wed, 24 Aug 2011 16:28:23 -0600 - -pagodacf (0.10-3build2) oneiric; urgency=low - - * Rebuild for OCaml 3.12.0. - - -- Colin Watson Mon, 16 May 2011 20:50:05 +0100 - -pagodacf (0.10-3build1) lucid; urgency=low - - * No-change rebuild for OCaml 3.11.2 transition (LP: #526073). + [ Dimitri John Ledkov ] + * Fix ftbfs with ocaml 4.04. - -- Ilya Barygin Wed, 24 Feb 2010 23:02:48 +0300 + -- Stéphane Glondu Wed, 19 Jul 2017 10:54:15 +0200 pagodacf (0.10-3) unstable; urgency=low diff -Nru pagodacf-0.10/debian/compat pagodacf-0.10/debian/compat --- pagodacf-0.10/debian/compat 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/compat 2017-07-19 08:52:34.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru pagodacf-0.10/debian/control pagodacf-0.10/debian/control --- pagodacf-0.10/debian/control 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/control 2017-07-19 08:52:32.000000000 +0000 @@ -1,14 +1,13 @@ Source: pagodacf Section: ocaml Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OCaml Maintainers -Uploaders: Samuel Mimram , Sylvain Le Gall -Build-Depends: debhelper (>= 7), dh-ocaml (>= 0.9.1), ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), dpatch +Maintainer: Debian OCaml Maintainers +Uploaders: Samuel Mimram +Build-Depends: debhelper (>= 10), dh-ocaml (>= 0.9.1), ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4) Standards-Version: 3.8.3 Homepage: http://www.sourceforge.net/projects/ocnae/ -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pagodacf.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pagodacf.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/pagodacf.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/pagodacf.git Package: libcf-ocaml-dev Architecture: any diff -Nru pagodacf-0.10/debian/patches/0001-Bugfix-in-polymorphic-variant-types-for-compilation-.patch pagodacf-0.10/debian/patches/0001-Bugfix-in-polymorphic-variant-types-for-compilation-.patch --- pagodacf-0.10/debian/patches/0001-Bugfix-in-polymorphic-variant-types-for-compilation-.patch 1970-01-01 00:00:00.000000000 +0000 +++ pagodacf-0.10/debian/patches/0001-Bugfix-in-polymorphic-variant-types-for-compilation-.patch 2017-07-19 08:54:15.000000000 +0000 @@ -0,0 +1,43 @@ +From: Stephane Glondu +Date: Wed, 19 Jul 2017 10:46:09 +0200 +Subject: Bugfix in polymorphic variant types for compilation with OCaml 3.10.2 + +--- + cf_ip4_addr.mli | 4 ++-- + cf_ip6_addr.mli | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cf_ip4_addr.mli b/cf_ip4_addr.mli +index 44b14b6..09418c1 100644 +--- a/cf_ip4_addr.mli ++++ b/cf_ip4_addr.mli +@@ -127,10 +127,10 @@ val all_hosts_group: multicast t + val all_routers_group: multicast t + + (** Use [equal a1 a2] to compare two IPv4 addresses for equality. *) +-val equal: [> opaque ] t -> [> opaque ] t -> bool ++val equal: ([> opaque ] as 'a) t -> 'a t -> bool + + (** Use [compare a1 a2] to compare the ordinality of two IPv4 addresses. *) +-val compare: [> opaque ] t -> [> opaque ] t -> int ++val compare: ([> opaque ] as 'a) t -> 'a t -> int + + (** Use [pton s] to convert the string [s] containing an IPv4 address in + dot-quad format to its equivalent opaque IPv4 address. Returns [None] if +diff --git a/cf_ip6_addr.mli b/cf_ip6_addr.mli +index 77f7898..c196d36 100644 +--- a/cf_ip6_addr.mli ++++ b/cf_ip6_addr.mli +@@ -167,10 +167,10 @@ val link_local_all_nodes: multicast t + val link_local_all_routers: multicast t + + (** Use [equal a1 a2] to compare two IPv6 addresses for equality. *) +-val equal: [> opaque ] t -> [> opaque ] t -> bool ++val equal: ([> opaque ] as 'a) t -> 'a t -> bool + + (** Use [compare a1 a2] to compare the ordinality of two IPv6 addresses. *) +-val compare: [> opaque ] t -> [> opaque ] t -> int ++val compare: ([> opaque ] as 'a) t -> 'a t -> int + + (** Use [pton s] to convert the string [s] containing an IPv6 address in + numeric format to its equivalent opaque IPv6 address. Returns [None] if diff -Nru pagodacf-0.10/debian/patches/0002-Use-stdint-types-to-fix-FTBFS-with-ocaml-4.04.patch pagodacf-0.10/debian/patches/0002-Use-stdint-types-to-fix-FTBFS-with-ocaml-4.04.patch --- pagodacf-0.10/debian/patches/0002-Use-stdint-types-to-fix-FTBFS-with-ocaml-4.04.patch 1970-01-01 00:00:00.000000000 +0000 +++ pagodacf-0.10/debian/patches/0002-Use-stdint-types-to-fix-FTBFS-with-ocaml-4.04.patch 2017-07-19 08:54:15.000000000 +0000 @@ -0,0 +1,270 @@ +From: Dimitri John Ledkov +Date: Wed, 19 Jul 2017 10:47:28 +0200 +Subject: Use stdint types to fix FTBFS with ocaml 4.04 + +--- + cf_common_p.h | 1 + + cf_tai64_p.c | 18 +++++++++--------- + cf_tai64_p.h | 2 +- + cf_tai64n_p.c | 42 +++++++++++++++++++++--------------------- + cf_tai64n_p.h | 2 +- + 5 files changed, 33 insertions(+), 32 deletions(-) + +diff --git a/cf_common_p.h b/cf_common_p.h +index 1b486bf..4fb44b8 100644 +--- a/cf_common_p.h ++++ b/cf_common_p.h +@@ -33,6 +33,7 @@ + #ifndef _CF_COMMON_P_H + #define _CF_COMMON_P_H + ++#include + #include + #include + #include +diff --git a/cf_tai64_p.c b/cf_tai64_p.c +index ac11358..07b48d5 100644 +--- a/cf_tai64_p.c ++++ b/cf_tai64_p.c +@@ -200,11 +200,11 @@ CAMLprim value cf_tai64_compare(value v1, value v2) + ---*/ + extern void cf_tai64_update(Cf_tai64_t* tai64Ptr) + { +- uint64 epoch; ++ uint64_t epoch; + + epoch = CF_TAI64_EPOCH; + epoch += cf_tai64_current_offset; +- tai64Ptr->s = epoch + ((uint64) time(0)); ++ tai64Ptr->s = epoch + ((uint64_t) time(0)); + } + + /*--- +@@ -290,7 +290,7 @@ CAMLprim value cf_tai64_of_unix_time(value v) + if (x < cf_tai64_unix_limit[0] || x > cf_tai64_unix_limit[1]) + cf_tai64_range_error(); + +- tai64.s = CF_TAI64_EPOCH + ((int64) x); ++ tai64.s = CF_TAI64_EPOCH + ((int64_t) x); + result = cf_tai64_alloc(&tai64); + + CAMLreturn(result); +@@ -305,7 +305,7 @@ CAMLprim value cf_tai64_to_unix_time(value v) + CAMLlocal1(result); + + double x; +- uint64 epoch; ++ uint64_t epoch; + + epoch = CF_TAI64_EPOCH; + epoch += cf_tai64_current_offset; +@@ -326,7 +326,7 @@ CAMLprim value cf_tai64_of_label(value v) + + Cf_tai64_t tai64; + int i; +- uint64 x; ++ uint64_t x; + + if (string_length(v) != 8) cf_tai64_label_error(); + for (i = 0, x = 0; i < 8; ++i) x = (x << 8) | Byte_u(v, i); +@@ -344,7 +344,7 @@ CAMLprim value cf_tai64_to_label(value v) + CAMLparam1(v); + CAMLlocal1(result); + +- uint64 x; ++ uint64_t x; + int i; + + result = alloc_string(8); +@@ -390,7 +390,7 @@ CAMLprim value cf_tai64_add_int32(value tai64Val, value dt32Val) + } + + /*--- +- Addition of int64 ++ Addition of int64_t + ---*/ + CAMLprim value cf_tai64_add_int64(value tai64Val, value dt64Val) + { +@@ -398,7 +398,7 @@ CAMLprim value cf_tai64_add_int64(value tai64Val, value dt64Val) + CAMLlocal1(result); + + Cf_tai64_t x; +- int64 dt64; ++ int64_t dt64; + + dt64 = Int64_val(dt64Val); + if (dt64 >= (CF_TAI64_EPOCH << 1)) cf_tai64_range_error(); +@@ -417,7 +417,7 @@ CAMLprim value cf_tai64_sub(value v1, value v2) + { + CAMLparam2(v1, v2); + +- int64 dt; ++ int64_t dt; + dt = Cf_tai64_val(v1)->s - Cf_tai64_val(v2)->s; + + CAMLreturn(copy_int64(dt)); +diff --git a/cf_tai64_p.h b/cf_tai64_p.h +index b974688..e6c6cfe 100644 +--- a/cf_tai64_p.h ++++ b/cf_tai64_p.h +@@ -43,7 +43,7 @@ + #define CF_TAI64_EPOCH 0x4000000000000000ULL + #define CF_TAI64_MJD_EPOCH 0x3fffffff2efbbf8aULL + +-struct cf_tai64_s { uint64 s; }; ++struct cf_tai64_s { uint64_t s; }; + typedef struct cf_tai64_s Cf_tai64_t; + + #define Cf_tai64_val(v) ((Cf_tai64_t*) Data_custom_val(v)) +diff --git a/cf_tai64n_p.c b/cf_tai64n_p.c +index 91775bd..9ebe59f 100644 +--- a/cf_tai64n_p.c ++++ b/cf_tai64n_p.c +@@ -88,7 +88,7 @@ static long cf_tai64n_op_hash(value v) + + vPtr = Cf_tai64n_val(v); + +- CAMLreturn((uint32) vPtr->s ^ vPtr->ns); ++ CAMLreturn((uint32_t) vPtr->s ^ vPtr->ns); + } + + static void cf_tai64n_op_serialize +@@ -98,7 +98,7 @@ static void cf_tai64n_op_serialize + + char buffer[12]; + unsigned long long x; +- uint32 y; ++ uint32_t y; + int i; + + x = Cf_tai64n_val(v)->s; +@@ -126,7 +126,7 @@ static unsigned long cf_tai64n_op_deserialize(void* data) + { + char buffer[12]; + unsigned long long x; +- uint32 y; ++ uint32_t y; + int i; + + deserialize_block_1(buffer, 8); +@@ -182,7 +182,7 @@ extern value cf_tai64n_alloc(const Cf_tai64n_t* tai64nPtr) + ---*/ + extern void cf_tai64n_update(Cf_tai64n_t* tai64nPtr) + { +- uint64 epoch; ++ uint64_t epoch; + struct timeval tv; + struct timezone tz; + +@@ -191,7 +191,7 @@ extern void cf_tai64n_update(Cf_tai64n_t* tai64nPtr) + + epoch = CF_TAI64_EPOCH; + epoch += cf_tai64_current_offset; +- tai64nPtr->s = epoch + ((uint64) tv.tv_sec); ++ tai64nPtr->s = epoch + ((uint64_t) tv.tv_sec); + tai64nPtr->ns = tv.tv_usec * 1000; + } + +@@ -238,11 +238,11 @@ CAMLprim value cf_tai64n_compose(value tai64Val, value nsVal) + CAMLlocal1(resultVal); + + Cf_tai64_t* tai64Ptr; +- uint32 ns; ++ uint32_t ns; + Cf_tai64n_t tai64n; + + tai64Ptr = Cf_tai64_val(tai64Val); +- ns = (uint32) Int_val(nsVal); ++ ns = (uint32_t) Int_val(nsVal); + if (ns < 0 || ns > 999999999) INVALID_ARGUMENT("compose: ns > 10^9"); + + tai64n.s = tai64Ptr->s; +@@ -287,13 +287,13 @@ CAMLprim value cf_tai64n_of_unix_time(value v) + Cf_tai64n_t tai64n; + double x, y; + +- y = (uint64) modf(Double_val(v), &x); ++ y = (uint64_t) modf(Double_val(v), &x); + x += (double) cf_tai64_current_offset; + if (x < cf_tai64_unix_limit[0] || x > cf_tai64_unix_limit[1]) + cf_tai64_range_error(); + +- tai64n.s = CF_TAI64_EPOCH + ((uint64) x); +- tai64n.ns = (uint32) (y * 1E9); ++ tai64n.s = CF_TAI64_EPOCH + ((uint64_t) x); ++ tai64n.ns = (uint32_t) (y * 1E9); + result = cf_tai64n_alloc(&tai64n); + + CAMLreturn(result); +@@ -308,7 +308,7 @@ CAMLprim value cf_tai64n_to_unix_time(value v) + CAMLlocal1(result); + + double x, y; +- uint64 epoch; ++ uint64_t epoch; + + epoch = CF_TAI64_EPOCH; + epoch += cf_tai64_current_offset; +@@ -331,8 +331,8 @@ CAMLprim value cf_tai64n_of_label(value v) + + Cf_tai64n_t tai64n; + int i; +- uint64 x; +- uint32 y; ++ uint64_t x; ++ uint32_t y; + + if (string_length(v) != 12) cf_tai64_label_error(); + for (i = 0, x = 0; i < 8; ++i) x = (x << 8) | Byte_u(v, i); +@@ -352,8 +352,8 @@ CAMLprim value cf_tai64n_to_label(value v) + CAMLparam1(v); + CAMLlocal1(result); + +- uint64 x; +- uint32 y; ++ uint64_t x; ++ uint32_t y; + int i; + + result = alloc_string(12); +@@ -377,12 +377,12 @@ CAMLprim value cf_tai64n_add(value tai64nVal, value dtVal) + + Cf_tai64n_t tai64n; + double zInt, zFrac; +- int64 x; +- int32 y; ++ int64_t x; ++ int32_t y; + + zFrac = modf(Double_val(dtVal), &zInt); +- x = (int64) zInt; +- y = (int32) (zFrac * 1E9); ++ x = (int64_t) zInt; ++ y = (int32_t) (zFrac * 1E9); + + tai64n.s = Cf_tai64n_val(tai64nVal)->s + x; + tai64n.ns = Cf_tai64n_val(tai64nVal)->ns + y; +@@ -409,8 +409,8 @@ CAMLprim value cf_tai64n_sub(value v1, value v2) + CAMLlocal1(resultVal); + + double dt; +- dt = ((int64) Cf_tai64n_val(v1)->s) - ((int64) Cf_tai64n_val(v2)->s); +- dt += (((int32) Cf_tai64n_val(v1)->ns) - ((int32) Cf_tai64n_val(v2)->ns)) ++ dt = ((int64_t) Cf_tai64n_val(v1)->s) - ((int64_t) Cf_tai64n_val(v2)->s); ++ dt += (((int32_t) Cf_tai64n_val(v1)->ns) - ((int32_t) Cf_tai64n_val(v2)->ns)) + * 1E-9; + + resultVal = copy_double(dt); +diff --git a/cf_tai64n_p.h b/cf_tai64n_p.h +index 9a9edb0..ea0c99b 100644 +--- a/cf_tai64n_p.h ++++ b/cf_tai64n_p.h +@@ -35,7 +35,7 @@ + + #include "cf_tai64_p.h" + +-struct cf_tai64n_s { uint64 s; uint32 ns; }; ++struct cf_tai64n_s { uint64_t s; uint32_t ns; }; + typedef struct cf_tai64n_s Cf_tai64n_t; + + #define Cf_tai64n_val(v) ((Cf_tai64n_t*) Data_custom_val(v)) diff -Nru pagodacf-0.10/debian/patches/00list pagodacf-0.10/debian/patches/00list --- pagodacf-0.10/debian/patches/00list 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_polymorphic_variant_bugfix.dpatch diff -Nru pagodacf-0.10/debian/patches/01_polymorphic_variant_bugfix.dpatch pagodacf-0.10/debian/patches/01_polymorphic_variant_bugfix.dpatch --- pagodacf-0.10/debian/patches/01_polymorphic_variant_bugfix.dpatch 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/patches/01_polymorphic_variant_bugfix.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_polymorphic_variant_bugfix.dpatch by Stephane Glondu -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Bugfix in polymorphic variant types for compilation with OCaml 3.10.2 - -@DPATCH@ -diff -urNad trunk~/cf_ip4_addr.mli trunk/cf_ip4_addr.mli ---- trunk~/cf_ip4_addr.mli 2006-07-09 07:55:47.000000000 +0200 -+++ trunk/cf_ip4_addr.mli 2008-05-23 01:09:54.000000000 +0200 -@@ -127,10 +127,10 @@ - val all_routers_group: multicast t - - (** Use [equal a1 a2] to compare two IPv4 addresses for equality. *) --val equal: [> opaque ] t -> [> opaque ] t -> bool -+val equal: ([> opaque ] as 'a) t -> 'a t -> bool - - (** Use [compare a1 a2] to compare the ordinality of two IPv4 addresses. *) --val compare: [> opaque ] t -> [> opaque ] t -> int -+val compare: ([> opaque ] as 'a) t -> 'a t -> int - - (** Use [pton s] to convert the string [s] containing an IPv4 address in - dot-quad format to its equivalent opaque IPv4 address. Returns [None] if -diff -urNad trunk~/cf_ip6_addr.mli trunk/cf_ip6_addr.mli ---- trunk~/cf_ip6_addr.mli 2006-07-09 07:55:47.000000000 +0200 -+++ trunk/cf_ip6_addr.mli 2008-05-23 01:09:54.000000000 +0200 -@@ -167,10 +167,10 @@ - val link_local_all_routers: multicast t - - (** Use [equal a1 a2] to compare two IPv6 addresses for equality. *) --val equal: [> opaque ] t -> [> opaque ] t -> bool -+val equal: ([> opaque ] as 'a) t -> 'a t -> bool - - (** Use [compare a1 a2] to compare the ordinality of two IPv6 addresses. *) --val compare: [> opaque ] t -> [> opaque ] t -> int -+val compare: ([> opaque ] as 'a) t -> 'a t -> int - - (** Use [pton s] to convert the string [s] containing an IPv6 address in - numeric format to its equivalent opaque IPv6 address. Returns [None] if diff -Nru pagodacf-0.10/debian/patches/series pagodacf-0.10/debian/patches/series --- pagodacf-0.10/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pagodacf-0.10/debian/patches/series 2017-07-19 08:54:15.000000000 +0000 @@ -0,0 +1,2 @@ +0001-Bugfix-in-polymorphic-variant-types-for-compilation-.patch +0002-Use-stdint-types-to-fix-FTBFS-with-ocaml-4.04.patch diff -Nru pagodacf-0.10/debian/rules pagodacf-0.10/debian/rules --- pagodacf-0.10/debian/rules 2017-07-20 21:32:14.000000000 +0000 +++ pagodacf-0.10/debian/rules 2017-07-19 08:50:34.000000000 +0000 @@ -8,12 +8,11 @@ include /usr/share/ocaml/ocamlvars.mk include /usr/share/ocaml/ocamlinit.mk -include /usr/share/dpatch/dpatch.make TMPDIR=debian/tmp DESTDIR=$(TMPDIR)/$(OCAML_STDLIB_DIR) -build: ocamlinit patch-stamp build-stamp +build: ocamlinit build-stamp build-stamp: dh_testdir if ! test -f .depend.org; then cp .depend .depend.org; fi @@ -27,7 +26,7 @@ touch build-stamp -clean: unpatch ocamlinit-clean +clean: ocamlinit-clean dh_testdir dh_testroot rm -f build-stamp diff -Nru pagodacf-0.10/debian/source/format pagodacf-0.10/debian/source/format --- pagodacf-0.10/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ pagodacf-0.10/debian/source/format 2017-07-19 08:50:34.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)