diff --git a/debian/changelog b/debian/changelog
index dde0f6efdb6585880913db52a0e7af7ee705072b..0ed5eb49e6b4df3fb0e015772059299fdb612126 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
-rrdtool (1.4.3-3) unstable; urgency=low
+rrdtool (1.4.7-1~1.gbpb59bb9) UNRELEASED; urgency=low
+
+ ** SNAPSHOT build @b59bb99492706d1548d6093fb8730bd3666b529e **
+
+ * [b59bb994] Merge commit 'upstream/1.4.7'
+
+ -- Bernd Zeimetz <bzed@debian.org> Tue, 24 Jan 2012 23:08:03 +0100
+
+rrdtool (1.4.3-3) unstable; urgency=high
* Reupload to unstable, which has Tcl 8.5 by now.
+ * debian/patches:
+ - Added bts625631-gcc4.5, fixing an compiler issue when using GCC 4.5;
+ thanks to Maxime Petazzoni for reporting this and Sven Hartge for
+ pointing out the upstream fix by anicka@suse.cz (Closes: #625631).
+ * Set urgency to high because of the fix for #625631.
+ * debian/source/format: Explicitly state version 1.0 for now.
+ * debian/control:
+ - Removed prehistoric 'Conflicts' introduced for an incompatibility with
+ Woody.
+ - Updated standards-version to 3.9.2.
+ * debian/rrdtool.doc-base:
+ - Fixed a spelling error detected by lintian.
- -- Sebastian Harl <tokkee@debian.org> Mon, 16 May 2011 09:39:40 +0200
+ -- Sebastian Harl <tokkee@debian.org> Mon, 16 May 2011 10:28:46 +0200
rrdtool (1.4.3-2) experimental; urgency=low