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

diff --cc debian/changelog
index 6915c38c9ff39858ecfea5a1e1dd2fecae78bf69,f4f5eb451d6193fa7e9421d526d9c348e32f8761..bfb45d245e35875a304147b1235078d5ca300f48
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -21,15 -22,8 +23,11 @@@ rrdtool (1.2.26-1) unstable; urgency=lo
      - debian/watch:
          * File redone to meet version 3 of uscan and to work again, using the
            new location of the upstream source.
-     - Renaming packages using transitional packages:
-         * librrd2-dev to librrd-dev as it was done on almost all other library
-           packages now.
-         * python-rrd to python-rrdtool to follow the Python policy.
  
 - -- Bernd Zeimetz <bzed@debian.org>  Sat, 09 Feb 2008 23:03:45 +0100
 +  [ Alexander Wirt ]
 +  * Removed rpath from perl and tcl modules
 +
 + -- Alexander Wirt <formorer@debian.org>  Sun, 10 Feb 2008 22:19:36 +0100
  
  rrdtool (1.2.19-1) unstable; urgency=low