patches: Added bts625631-gcc4.5, fixing an compiler issue when using GCC 4.5.

Thanks to Maxime Petazzoni for reporting this and Sven Hartge for pointing out
the upstream fix by anicka@suse.cz.
Closes: #625631

diff --git a/debian/changelog b/debian/changelog
index dde0f6efdb6585880913db52a0e7af7ee705072b..10993f826a1bdaa10f59ab79a6c70cdd693b9d43 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 rrdtool (1.4.3-3) unstable; urgency=low
 
   * Reupload to unstable, which has Tcl 8.5 by now.
+  * debian/patches:
+    - Added bts625631-gcc4.5, fixing an compiler issue when using GCC 4.5;
+      thanks to Maxime Petazzoni for reporting this and Sven Hartge for
+      pointing out the upstream fix by anicka@suse.cz (Closes: #625631).
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 16 May 2011 09:39:40 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 16 May 2011 09:55:27 +0200
 
 rrdtool (1.4.3-2) experimental; urgency=low
 

diff --git a/debian/patches/bts625631-gcc4.5 b/debian/patches/bts625631-gcc4.5
new file mode 100644 (file)
index 0000000..18f735f
--- /dev/null
+++ b/debian/patches/bts625631-gcc4.5
@@ -0,0 +1,10 @@
+diff a/src/rrd_format.h b/src/rrd_format.h\r
+--- a/src/rrd_format.h\r
++++ b/src/rrd_format.h\r
+@@ -36,5 +36,5 @@\r
+ #define RRD_VERSION   "0004"\r
+ #define RRD_VERSION3  "0003"\r
+-#define FLOAT_COOKIE  8.642135E130\r
++#define FLOAT_COOKIE  ((double)8.642135E130)\r
+ \r
+ typedef union unival {\r

diff --git a/debian/patches/series b/debian/patches/series
index ab9438ebed2dc30c602423d6f640b6c2014bcbe9..3e14c51dfaf2b891bca123b699fdabdb58ac1e29 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no-rpath-for-perl
 implicit-decl-fix
 bts530814-hurd
 tcl-8.5
+bts625631-gcc4.5