Merged branch 'experimental'.

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 30303a59360249440c70aa9fb26efbb0b1fec5ed,0b199cc9d799a5f0bcf930a53784ea5d75ef5f01..b89635c52fb685fca58b577496f99d4d6248ef7c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,53 +1,66 @@@
 +rrdtool (1.3.8-2) UNRELEASED; urgency=low
 +
 +  [ Bernd Zeimetz ]
 +  * debian/rules:
 +    - Prepare to build with Python 2.6.
 +
 +  [ Sebastian Harl ]
 +  * debian/README.Debian:
 +    - Added a note about <http://oss.oetiker.ch/rrdtool/pub/contrib/> as
 +      requested in #323969 and lost in 1.2.26-1.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Thu, 24 Sep 2009 11:50:44 +0200
 +
+ rrdtool (1.4~rc2+20091004-1) experimental; urgency=low
+ 
+   [ Sebastian Harl ]
+   * New upstream SVN snapshot based on trunk at revision 1930.
+   * Uploading to experimental.
+   * debian/control:
+     - Build-depend on gettext instead of intltool following the switch made by
+       upstream.
+     - Build-depend on libdbi0-dev, required by rrdgraph to read values from an
+       SQL database.
+     - Updated Standards-Version to 3.8.3.
+     - Let the synopsis start with a small letter (as suggested in dev-ref
+       6.2.2).
+     - Let rrdtool-dbg recommend liblua5.1-rrd0.
+   * debian/rules:
+     - Remove config.h in the 'clean' target - this is created by configure but
+       not cleaned up by any Makefile.
+     - Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_TYPE to check for the
+       build host.
+     - Set examples/rrdcached/RRDCached.pm's file mode to 0644.
+     - Run dh_installinit for the "rrdcached" package.
+   * debian/patches:
+     - Removed bts494874-gnu-kfreebsd - included upstream.
+     - Removed bts332766-negative-timestamps - included upstream.
+     - Removed compiler-warning-fixes - included upstream.
+     - Updated bts428778-floating-point-exception for RRDtool 1.4.
+   * Added debian/README.source:
+     - The file includes a pointer to /usr/share/doc/quilt/README.source.
+   * debian/librrd4.symbols:
+     - Added symbols introduced in 1.4~rc2.
+   * Added new binary package 'rrdcached' for the newly introduced "data
+     caching daemon".
+   * debian/rrdcached.init.d, debian/rrdcached.default:
+     - Added an init script for rrdcached supporting start, stop, status,
+       restart, force-reload. The script is based on the collectd init script.
+   * debian/rrdtool.install:
+     - Install manpages in section 3 as well.
+   * debian/rrdcached.postrm:
+     - Remove /var/lib/rrdcached/ on purge.
+ 
+   [ Bernd Zeimetz ]
+   * debian/rules, debian/control:
+     - Build Lua bindings and put them into appropriate packages.
+   * Added debian/lua-rrd.h.
+   * debian/rules:
+     - Tell dh_makeshlibs to not modify postinst/postrm of the lua packages -
+       we do not need to run ldconfig when installing them.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Mon, 05 Oct 2009 22:27:13 +0200
+ 
  rrdtool (1.3.8-1) unstable; urgency=low
  
    [ Sebastian Harl ]

diff --cc debian/rules
Simple merge