debian/patches/implicit-decl-fix:

* debian/patches/implicit-decl-fix:
- Patching the implicit declaration in rrd_update.c in a nicer way.

diff --git a/debian/changelog b/debian/changelog
index 13cdde8e6e41570744fe28f14e9c87fe843147f6..441e355a994fb826ff0b3053346858827847249c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 rrdtool (1.2.27-2~bpo40+1) etch-backports; urgency=low
 
   * Etch backport.
-
- -- Bernd Zeimetz <bzed@debian.org>  Thu, 17 Apr 2008 15:39:24 +0200
+  * debian/rules:
+    - Adding an option to point configure to the right path to tcl. This is
+      not needed for Lenny, but we also add it here to make coming backports
+      more simple.
+  * debian/patches/implicit-decl-fix:
+    - Patching the implicit declaration in rrd_update.c in a nicer way.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 20 Apr 2008 02:09:20 +0200
 
 rrdtool (1.2.27-2) unstable; urgency=low
 

diff --git a/debian/patches/implicit-decl-fix b/debian/patches/implicit-decl-fix
index 4640a1bc2083b7ff4fa02e83533cf77cb8fcdb15..cffa4a8dac1eb832d2b3c6f44effa759431e5aaa 100644 (file)
--- a/debian/patches/implicit-decl-fix
+++ b/debian/patches/implicit-decl-fix
@@ -1,7 +1,7 @@
 Index: rrdtool/src/rrd_tool.c
 ===================================================================
---- rrdtool.orig/src/rrd_tool.c        2008-02-24 14:05:10.000000000 +0100
-+++ rrdtool/src/rrd_tool.c     2008-02-24 14:24:37.000000000 +0100
+--- rrdtool.orig/src/rrd_tool.c        2008-04-20 02:11:52.000000000 +0200
++++ rrdtool/src/rrd_tool.c     2008-04-20 02:11:58.000000000 +0200
 @@ -4,6 +4,8 @@
   * rrd_tool.c  Startup wrapper
   *****************************************************************************/
@@ -13,19 +13,16 @@ Index: rrdtool/src/rrd_tool.c
  
 Index: rrdtool/src/rrd_update.c
 ===================================================================
---- rrdtool.orig/src/rrd_update.c      2008-02-24 14:05:10.000000000 +0100
-+++ rrdtool/src/rrd_update.c   2008-02-24 14:28:33.000000000 +0100
-@@ -432,7 +432,12 @@
- #ifdef USE_MADVISE
-     /* when we use mmaping we tell the kernel the mmap equivalent
-        of POSIX_FADV_RANDOM */
--    madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
-+#ifdef __USE_BSD
-+      madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
-+#endif
-+#ifdef __USE_XOPEN2K
-+    posix_madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
+--- rrdtool.orig/src/rrd_update.c      2008-04-20 02:11:52.000000000 +0200
++++ rrdtool/src/rrd_update.c   2008-04-22 15:38:38.000000000 +0200
+@@ -22,6 +22,10 @@
+ #include "rrd_is_thread_safe.h"
+ #include "unused.h"
+ 
++#ifdef USE_MADVISE
++ #include <sys/mman.h>
 +#endif
- #endif
- #endif
-     /* loop through the arguments. */
++
+ #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+ /*
+  * WIN32 does not have gettimeofday   and struct timeval. This is a quick and dirty