From: Sebastian Harl Date: Fri, 25 Sep 2009 11:21:13 +0000 (+0200) Subject: patches: Removed bts332766-negative-timestamps - included upstream. X-Git-Tag: experimental/1.4--rc2+20091004~38 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38336a9b8e11d03a435d4cb0c1ea8561d491283c;p=pkg-rrdtool.git patches: Removed bts332766-negative-timestamps - included upstream. --- diff --git a/debian/changelog b/debian/changelog index da7e184..c61b56b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ rrdtool (1.4~rc2-1) experimental; urgency=low not cleaned up by any Makefile. * debian/patches: - Removed bts494874-gnu-kfreebsd - included upstream. + - Removed bts332766-negative-timestamps - included upstream. - -- Sebastian Harl Fri, 25 Sep 2009 13:11:46 +0200 + -- Sebastian Harl Fri, 25 Sep 2009 13:20:52 +0200 rrdtool (1.3.8-1) unstable; urgency=low diff --git a/debian/patches/bts332766-negative-timestamps b/debian/patches/bts332766-negative-timestamps deleted file mode 100644 index 9ae9a15..0000000 --- a/debian/patches/bts332766-negative-timestamps +++ /dev/null @@ -1,15 +0,0 @@ -diff a/src/rrd_update.c b/src/rrd_update.c ---- a/src/rrd_update.c -+++ b/src/rrd_update.c -@@ -972,6 +972,11 @@ static int get_time_from_reading( - return -1; - }; - setlocale(LC_NUMERIC, old_locale); -+ if (tmp < 0.0){ -+ gettimeofday(&tmp_time, 0); -+ tmp = (double)tmp_time.tv_sec + (double)tmp_time.tv_usec * 1e-6f + tmp; -+ } -+ - *current_time = floor(tmp); - *current_time_usec = (long) ((tmp - (double) *current_time) * 1e6f); - } diff --git a/debian/patches/series b/debian/patches/series index 3d450d2..c23c226 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ no-rpath-for-perl implicit-decl-fix compiler-warning-fixes bts530814-hurd -bts332766-negative-timestamps