diff -pruN 0.11.12/debian/changelog 0.11.12ubuntu1/debian/changelog
--- 0.11.12/debian/changelog	2010-12-04 19:52:43.000000000 +0000
+++ 0.11.12ubuntu1/debian/changelog	2011-02-05 13:59:31.000000000 +0000
@@ -1,3 +1,15 @@
+defoma (0.11.12ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #704741)
+    - debian/control: Drop libfont-freetype-perl back to a suggests,
+      as libft-perl was previously; defoma is a deprecated font system
+      that should be on its way out, there's no reason for this package
+      to pull recommends into main.
+  * libs/libdefoma-subst.pl:
+    - Changes on this file have been superceded in Debian.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Wed, 19 Jan 2011 03:13:33 +0100
+
 defoma (0.11.12) unstable; urgency=low
 
   * QA upload
@@ -9,6 +21,20 @@ defoma (0.11.12) unstable; urgency=low
 
  -- Ralf Treinen <treinen@debian.org>  Sat, 04 Dec 2010 20:52:43 +0100
 
+defoma (0.11.11ubuntu2) natty; urgency=low
+
+  * Drop perl dependency and imports of File::Copy, and replace the copy()
+    calls with /bin/cp.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 01 Nov 2010 14:06:18 -0400
+
+defoma (0.11.11ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Drop libfont-freetype-perl to a suggests.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 03 Jun 2010 21:23:29 +0000
+
 defoma (0.11.11) unstable; urgency=low
 
   * QA upload to fix prehistoric i18n bug and a few lintian
@@ -26,6 +52,14 @@ defoma (0.11.11) unstable; urgency=low
 
  -- Christian Perrier <bubulle@debian.org>  Wed, 31 Mar 2010 22:08:16 +0200
 
+defoma (0.11.10-4ubuntu1) lucid; urgency=low
+
+  * Drop libfont-freetype-perl back to a suggests, as libft-perl was
+    previously; defoma is a deprecated font system that should be on its way
+    out, there's no reason for this package to pull recommends into main.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 17 Apr 2010 23:28:04 +0000
+
 defoma (0.11.10-4) unstable; urgency=high
 
   * QA upload.
diff -pruN 0.11.12/debian/control 0.11.12ubuntu1/debian/control
--- 0.11.12/debian/control	2010-12-04 20:04:05.000000000 +0000
+++ 0.11.12ubuntu1/debian/control	2011-02-05 13:59:31.000000000 +0000
@@ -1,7 +1,8 @@
 Source: defoma
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends-Indep: debiandoc-sgml
 Build-Depends: debhelper (>= 7), po4a
 Standards-Version: 3.6.2.0
@@ -10,8 +11,7 @@ Package: defoma
 Architecture: all
 Depends: whiptail | dialog, file, ${perl:Depends}, ${misc:Depends}
 Enhances: debhelper
-Suggests: defoma-doc, psfontmgr, x-ttcidfont-conf
-Recommends: libfont-freetype-perl
+Suggests: defoma-doc, psfontmgr, x-ttcidfont-conf, libfont-freetype-perl
 Conflicts: defoma-x, defoma-ps, defoma-gs, psfontmgr (<< 0.5.0), x-ttcidfont-conf (<< 5), dfontmgr (<< 0.10.0)
 Description: Debian Font Manager -- automatic font configuration framework
  Defoma, which stands for DEbian FOnt MAnager, provides a framework