diff -u ddd-3.3.12/debian/control ddd-3.3.12/debian/control
--- ddd-3.3.12/debian/control
+++ ddd-3.3.12/debian/control
@@ -2,7 +2,8 @@
 Section: devel
 Priority: optional
 Build-Depends: automake (>= 1:1.10), bison, cdbs (>= 0.4.0), debhelper (>= 7), flex, lesstif2-dev, libreadline-dev, libtool, libxaw7-dev, libxp-dev, libelfg0-dev [powerpc], rsh-client, lpr (>> 0), xterm, x11-utils
-Maintainer: Daniel Schepler <schepler@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Schepler <schepler@debian.org>
 Homepage: http://www.gnu.org/software/ddd/
 Standards-Version: 3.8.3
 
diff -u ddd-3.3.12/debian/changelog ddd-3.3.12/debian/changelog
--- ddd-3.3.12/debian/changelog
+++ ddd-3.3.12/debian/changelog
@@ -1,3 +1,10 @@
+ddd (1:3.3.12-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/ddd.install: Fix install .xmp file. (LP: # 614766)
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Mon, 09 Aug 2010 22:04:48 +0200
+
 ddd (1:3.3.12-1) unstable; urgency=low
 
   * New upstream release.  Closes: #555511.  Thanks to giagimari@libero.it
@@ -12,6 +19,22 @@
 
  -- Daniel Schepler <schepler@debian.org>  Tue, 10 Nov 2009 14:01:10 -0800
 
+ddd (1:3.3.11-1ubuntu2) karmic; urgency=low
+
+  * debian/patches/005_ftbfs.diff: Add header to fix FTBFS (LP: #434206)
+    Thanks to Ilya Barygin and Martin Michlmayr for the patch.
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 22 Sep 2009 11:41:33 +0200
+
+ddd (1:3.3.11-1ubuntu1) jaunty; urgency=low
+
+  * Add .desktop file. (LP: #299066)
+  * [debian.ddd.install]
+    - install .desktop file;
+    - install program icon.
+
+ -- Loïc Martin <loic.martin3@gmail.com>  Fri, 30 Jan 2009 19:13:50 +0100
+
 ddd (1:3.3.11-1) unstable; urgency=low
 
   * New upstream release.
diff -u ddd-3.3.12/debian/ddd.install ddd-3.3.12/debian/ddd.install
--- ddd-3.3.12/debian/ddd.install
+++ ddd-3.3.12/debian/ddd.install
@@ -5,0 +6 @@
+icons/ddd.xpm usr/share/pixmaps