diff -u rrdtool-1.2.27/debian/control rrdtool-1.2.27/debian/control
--- rrdtool-1.2.27/debian/control
+++ rrdtool-1.2.27/debian/control
@@ -1,7 +1,8 @@
 Source: rrdtool
 Section: utils
 Priority: optional
-Maintainer: Debian RRDtool Team <rrdtool@ml.snow-crash.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian RRDtool Team <rrdtool@ml.snow-crash.org>
 Uploaders: Sebastian Harl <sh@tokkee.org>, Alexander Wirt <formorer@debian.org>, Bernd Zeimetz <bzed@debian.org>
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, quilt,
diff -u rrdtool-1.2.27/debian/changelog rrdtool-1.2.27/debian/changelog
--- rrdtool-1.2.27/debian/changelog
+++ rrdtool-1.2.27/debian/changelog
@@ -1,3 +1,10 @@
+rrdtool (1.2.27-2ubuntu1) intrepid; urgency=low
+
+  * Fix buffer overflow in librrd's error handling. Cherry-picked from 
+    Debian bug #450578. (LP: #96850)
+
+ -- James Westby <james.westby@canonical.com>  Wed, 15 Oct 2008 19:02:35 +0100
+
 rrdtool (1.2.27-2) unstable; urgency=low
 
   * Renamed global definition of LDFLAGS to LINKER_FLAGS in debian/rules to
only in patch2:
unchanged:
--- rrdtool-1.2.27.orig/src/rrd_not_thread_safe.c
+++ rrdtool-1.2.27/src/rrd_not_thread_safe.c
@@ -23,8 +23,8 @@
 static struct rrd_context global_ctx = {
     MAXLEN,
     ERRBUFLEN,
-    rrd_error, 
-    rrd_liberror
+    rrd_liberror,
+    rrd_error
 };
 /* #include <stdarg.h> */