Merge branch 'master' of git://git.snow-crash.org/pkg-rrdtool

Conflicts:

	debian/changelog

diff --cc debian/changelog
index e8cca00fffa536e866b529b79f8ce6cbc6e1e271,6d577b1e9bda144b59ed48bdc1174ab21f8e3d32..8beba106cec4f5c55ae9a658351fa689e449b57a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,22 @@@
 -rrdtool (1.3.7-2) unstable; urgency=low
 +rrdtool (1.3.8-1) unstable; urgency=low
  
 -  * debian/rules, debian-control:
++  [ Sebastian Harl ]
 +  * New upstream release:
 +    - Fixed various memory leaks in the Python bindings, thanks to Anders
 +      Hammarquist for reporting this and providing a patch (Closes: #529291).
 +  * debian/patches:
 +    - Added bts530814-hurd to fix a FTBFS on Hurd, thanks to Marc Dequènes for
 +      reporting this and providing a patch (Closes: #530814).
 +    - Removed doc-fixes - applied upstream.
-   * debian/control, debian/rules:
++  * debian/control:
 +    - Removed transitional package "python-rrd" which is no longer required.
 +
++  [ Bernd Zeimetz ]
++  * debian/rules, debian/control:
+     - Build Python dbg modules into rrdtool-dbg. Add necessary
 -      (build-) dependencies. 
++      (build-) dependencies.
+ 
 - -- Bernd Zeimetz <bzed@debian.org>  Mon, 01 Jun 2009 13:22:31 +0200
 + -- Sebastian Harl <tokkee@debian.org>  Mon, 01 Jun 2009 13:23:33 +0200
  
  rrdtool (1.3.7-1) unstable; urgency=low
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge