Merged branch 'master' into experimental.

* The unreleased 1.2.27-3 changelog entry has been merged. This has to be
  updated later on.
* The changes to the implicit-decl-fix patch do not apply to 1.3 any more.

diff --cc debian/changelog
index 02f9d690ae70bb939c64109d4a15270a9239eea1,a830a233d3694a0cea99c5832001e0d6b3fb023c..ebbb8aaac9082b0a6ce4cdf6e08b3ffdbb878048
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,14 +1,30 @@@
 +rrdtool (1.3~rc4-1) experimental; urgency=low
 +
 +  * New upstream release candidate.
 +  * debian/patches:
 +    - Updated patches to apply on 1.3rc4.
 +    - "implicit-decl-fix" partly applied upstream
 +    - "typos" removed, has been applied upstream
 +  * debian/control:
 +    - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd2 -
 +      upstream no longer ships DejaVuSansMono-Roman.ttf.
 +  * debian/librrd2.symbols:
 +    - Updated to the symbols provided by 1.3rc4 - none of the removed symbols
 +      is supposed to be used outside of rrdtool.
 +
 + -- Sebastian Harl <sh@tokkee.org>  Sun, 18 May 2008 22:07:23 +0200
 +
+ rrdtool (1.2.27-3) UNRELEASED; urgency=low
+ 
+   * 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
  
    * Renamed global definition of LDFLAGS to LINKER_FLAGS in debian/rules to