From: Bernd Zeimetz <bzed@debian.org>
Date: Sun, 10 Feb 2008 21:15:42 +0000 (+0100)
Subject: Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool
X-Git-Tag: debian/1.2.26-1~10^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6b145c9d9f85c0043cec9a41d4539f17f295c87;p=pkg-rrdtool.git

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

Conflicts:

	debian/changelog
---

a6b145c9d9f85c0043cec9a41d4539f17f295c87
diff --cc debian/changelog
index 0206db3,1aa8666..f4f5eb4
--- a/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.