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

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 0206db33b35fef13e1c6430c18dd8f4aa2022bd4,1aa8666142435969fb9c012d59a9d9b0c019fc48..f4f5eb451d6193fa7e9421d526d9c348e32f8761
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -13,11 -13,10 +13,12 @@@ rrdtool (1.2.26-1) unstable; urgency=lo
          * Update of Maintainer, Standards-Version, Uploaders
          * Building ruby modules now (Closes: #453304).
          * Change the Python binary package to conform with the Python policy,
 -          using python-support.
 +          using python-support. Also renaming the package to follow the Python
 +          policy.
+         * Make rrdtool-tcl compliant with policy
          * Bump Standards Version to 3.7.3.
          * Using and depending on quilt to handle patches.
 +        * Adding Provides: librrd-dev to librrd2-dev.
      - debian/watch:
          * File redone to meet version 3 of uscan and to work again, using the
            new location of the upstream source.

diff --cc debian/rules
Simple merge