diff -u duma-2.5.15/debian/control duma-2.5.15/debian/control
--- duma-2.5.15/debian/control
+++ duma-2.5.15/debian/control
@@ -1,7 +1,8 @@
 Source: duma
 Section: devel
 Priority: extra
-Maintainer: Julien Danjou <acid@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Julien Danjou <acid@debian.org>
 Build-Depends: cdbs, debhelper (>= 6)
 Standards-Version: 3.8.1
 Homepage: http://duma.sf.net
diff -u duma-2.5.15/debian/changelog duma-2.5.15/debian/changelog
--- duma-2.5.15/debian/changelog
+++ duma-2.5.15/debian/changelog
@@ -1,3 +1,12 @@
+duma (2.5.15-1.1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #599142), remaining changes:
+    - add CFLAGS+="-U_FORTIFY_SOURCE" in debian/rules since Ubuntu
+      default -D_FORTIFY_SOURCE=2 clashes with duma overloading all
+      standard memory allocation functions
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Sun, 27 Jun 2010 23:26:38 +0200
+
 duma (2.5.15-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -6,6 +15,15 @@
 
  -- Johann Felix Soden <johfel@gmx.de>  Fri, 27 Nov 2009 23:45:01 +0100
 
+duma (2.5.15-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #388935), remaining changes:
+    - add CFLAGS+="-U_FORTIFY_SOURCE" in debian/rules since Ubuntu
+      default -D_FORTIFY_SOURCE=2 clashes with duma overloading all
+      standard memory allocation functions
+
+ -- Ilya Barygin <conscious@mail.ru>  Thu, 18 Jun 2009 15:25:20 +0400
+
 duma (2.5.15-1) unstable; urgency=low
 
   * New upstream release (Closes: #531169)
@@ -13,6 +31,15 @@
 
  -- Julien Danjou <acid@debian.org>  Thu, 04 Jun 2009 14:12:00 +0200
 
+duma (2.5.14-2ubuntu1) jaunty; urgency=low
+
+  * Fix FTBS (LP: #309732):
+    add CFLAGS+="-U_FORTIFY_SOURCE" in debian/rules since Ubuntu
+    default -D_FORTIFY_SOURCE=2 clashes with duma overloading all
+    standard memory allocation functions.
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Fri, 19 Dec 2008 18:22:32 +0100
+
 duma (2.5.14-2) unstable; urgency=low
 
   * Fix typo in long description (Closes: #486736)
diff -u duma-2.5.15/debian/rules duma-2.5.15/debian/rules
--- duma-2.5.15/debian/rules
+++ duma-2.5.15/debian/rules
@@ -6,4 +6,6 @@
 DEB_MAKE_INSTALL_TARGET=install prefix=$(DEB_DESTDIR)/usr
 
+CFLAGS+="-U_FORTIFY_SOURCE"
+
 cleanbuilddir::
 	rm -rf createconf createconf.o