diff -u rrdtool-1.4.3/debian/changelog rrdtool-1.4.3/debian/changelog --- rrdtool-1.4.3/debian/changelog +++ rrdtool-1.4.3/debian/changelog @@ -1,3 +1,10 @@ +rrdtool (1.4.3-1ubuntu3) natty; urgency=low + + * debian/patches/fix-i386-failure-lp722938.patch: Fix RRD creation on i386. + Patch taken from upstream. (LP: #722938) + + -- Andres Rodriguez Tue, 22 Feb 2011 18:20:11 -0500 + rrdtool (1.4.3-1ubuntu2) natty; urgency=low * Rebuild to add support for python 2.7. diff -u rrdtool-1.4.3/debian/patches/series rrdtool-1.4.3/debian/patches/series --- rrdtool-1.4.3/debian/patches/series +++ rrdtool-1.4.3/debian/patches/series @@ -6,0 +7 @@ +fix-i386-failure-lp722938.patch only in patch2: unchanged: --- rrdtool-1.4.3.orig/debian/patches/fix-i386-failure-lp722938.patch +++ rrdtool-1.4.3/debian/patches/fix-i386-failure-lp722938.patch @@ -0,0 +1,20 @@ +Description: Fix failure in i386 + rrdtool fails to execute when in i386 displaying a message such as: + 'ERROR: This RRD was created on another architecture' +Origin: upstream, http://oss.oetiker.ch/rrdtool-trac/changeset/2069/branches/1.4/program/src/rrd_format.h#file0 +Bug-Launchpad: https://bugs.launchpad.net/ubuntu/+source/rrdtool/+bug/722938 +Last-Update: 2011-02-22 + +Index: rrdtool-1.4.3/src/rrd_format.h +=================================================================== +--- rrdtool-1.4.3.orig/src/rrd_format.h 2011-02-22 17:35:29.981317659 -0500 ++++ rrdtool-1.4.3/src/rrd_format.h 2011-02-22 17:37:13.391469334 -0500 +@@ -35,7 +35,7 @@ + /* changed because microsecond precision requires another field */ + #define RRD_VERSION "0004" + #define RRD_VERSION3 "0003" +-#define FLOAT_COOKIE 8.642135E130 ++#define FLOAT_COOKIE ((double)8.642135E130) + + typedef union unival { + unsigned long u_cnt;