* New upstream release.

* debian/rules, debian/librrd2.install:
  - Install rrdtool's ttf and configure rrd to use it.
* debian/patches:
  - Updating patches to apply on 1.2.27.

diff --git a/debian/changelog b/debian/changelog
index add378937301c923a17427aca0587f5054f8483a..d810f9ded82e7e430be7e03d325dbd41a1209abb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rrdtool (1.2.27-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules, debian/librrd2.install:
+    - Install rrdtool's ttf and configure rrd to use it.
+  * debian/patches:
+    - Updating patches to apply on 1.2.27.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 24 Feb 2008 14:52:21 +0100
+
 rrdtool (1.2.26-1) unstable; urgency=low
 
   [ Bernd Zeimetz ]

diff --git a/debian/control b/debian/control
index 73745b1d07e43da20f5a79e7d3e4d41ab3a2253f..bf9b6e70cbc2c21c77ce6054ff9193da94dcf47d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Description: Time-series data storage and display system (programs)
 Package: librrd2
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ttf-dejavu (>= 2.1-1), ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: rrdtool (<< 1.0.42-1), librrds-perl (<< 1.0.42-1)
 Description: Time-series data storage and display system (runtime library)
  The Round Robin Database Tool (RRDtool) is a system to store and display

diff --git a/debian/librrd2.install b/debian/librrd2.install
index eae948a430785fa19efba8d10bbd1fca6539042c..3f96786d25bb514bc5daa9656be129c4e398671e 100644 (file)
--- a/debian/librrd2.install
+++ b/debian/librrd2.install
@@ -1,2 +1,3 @@
-usr/lib/librrd.so.2.*
-usr/lib/librrd_th.so.2.*
+usr/lib/librrd.so.2.* 
+usr/lib/librrd_th.so.2.* 
+../../src/DejaVuSansMono-Roman.ttf usr/share/rrdtool/librrd$(LIB_major)

diff --git a/debian/patches/implicit-decl-fix b/debian/patches/implicit-decl-fix
index ebec677954988a4b6744350791d4848a30e6c2fe..4640a1bc2083b7ff4fa02e83533cf77cb8fcdb15 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-11 11:07:55.000000000 +0100
-+++ rrdtool/src/rrd_tool.c     2008-02-11 11:08:10.000000000 +0100
+--- 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
 @@ -4,6 +4,8 @@
   * rrd_tool.c  Startup wrapper
   *****************************************************************************/
@@ -13,19 +13,19 @@ Index: rrdtool/src/rrd_tool.c
  
 Index: rrdtool/src/rrd_update.c
 ===================================================================
---- rrdtool.orig/src/rrd_update.c      2008-02-11 11:47:32.000000000 +0100
-+++ rrdtool/src/rrd_update.c   2008-02-11 11:47:48.000000000 +0100
-@@ -430,8 +430,13 @@
- #ifdef HAVE_MADVISE
+--- 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,POSIX_MADV_RANDOM);
- #endif
-+#ifdef __USE_XOPEN2K
-+    posix_madvise(rrd_mmaped_file,rrd_filesize,POSIX_MADV_RANDOM);
++      madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
 +#endif
++#ifdef __USE_XOPEN2K
++    posix_madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
 +#endif
+ #endif
  #endif
      /* loop through the arguments. */
-     for(arg_i=0; arg_i<argc;arg_i++) {

diff --git a/debian/rules b/debian/rules
index a2d2ffe89311f13d687eaa3d5a26bae377ee7c39..679934a177982a95abddb270e9d14b421bd2454f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,8 @@ CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool
 #install perl libs in vendor mode
 CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor 
 
+#path to our ttf font
+CONFFLAGS += --with-rrd-default-font=/usr/share/rrdtool/librrd$(LIB_major)/DejaVuSansMono-Roman.ttf
 
 
 #let's take care of optimization + debug builds