diff -pruN 0.20-2.1/debian/changelog 0.20-2.1ubuntu1/debian/changelog
--- 0.20-2.1/debian/changelog	2008-11-01 19:26:11.000000000 +0000
+++ 0.20-2.1ubuntu1/debian/changelog	2008-11-01 18:30:26.000000000 +0000
@@ -1,3 +1,12 @@
+netmrg (0.20-2.1ubuntu1) intrepid; urgency=low
+
+  * Revert the change to the build-dependency on rrdtool, as we don't
+    have a new enough rrdtool to satisfy it, but ours is old enough
+    that it never caused the problem in the first place. This change
+    can be dropped when merging, assuming we have the new rrdtool.
+
+ -- James Westby <james.westby@canonical.com>  Fri, 10 Oct 2008 15:04:23 +0100
+
 netmrg (0.20-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -pruN 0.20-2.1/debian/control 0.20-2.1ubuntu1/debian/control
--- 0.20-2.1/debian/control	2008-11-01 19:26:11.000000000 +0000
+++ 0.20-2.1ubuntu1/debian/control	2008-11-01 18:30:26.000000000 +0000
@@ -2,7 +2,7 @@ Source: netmrg
 Section: net
 Priority: optional
 Maintainer: Uwe Steinmann <steinm@debian.org>
-Build-Depends: rrdtool (>= 1.3.1-4), debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl
+Build-Depends: rrdtool, debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl
 Standards-Version: 3.7.2
 
 Package: netmrg