diff -pruN 0.2.22-3/debian/changelog 0.2.22-3ubuntu1/debian/changelog
--- 0.2.22-3/debian/changelog	2010-02-04 07:34:19.000000000 +0000
+++ 0.2.22-3ubuntu1/debian/changelog	2010-02-04 07:32:28.000000000 +0000
@@ -1,9 +1,26 @@
+icedove-nostalgy (0.2.22-3ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, Ubuntu remaining changes:
+    - debian/control: Replace Icedove occurrences with Thunderbird.
+    - Adjust Provides/Replaces to replace thunderbird-nostalgy properly.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 04 Feb 2010 06:00:19 +0100
+
 icedove-nostalgy (0.2.22-3) unstable; urgency=low
 
   * [4f9aaca] Remove icedove-3.0 link now that it has been renamed to icedove.
 
  -- Guido Günther <agx@sigxcpu.org>  Fri, 22 Jan 2010 21:49:56 +0100
 
+icedove-nostalgy (0.2.22-2ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, Ubuntu remaining changes:
+    - debian/control: Replace Icedove occurrences with Thunderbird.
+  * debian/control:
+    - Adjust Provides/Replaces to replace thunderbird-nostalgy properly.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Tue, 05 Jan 2010 09:50:42 +0100
+
 icedove-nostalgy (0.2.22-2) unstable; urgency=low
 
   * [9a43fd3] add replaces
@@ -21,6 +38,16 @@ icedove-nostalgy (0.2.22-1) unstable; ur
 
  -- Guido Günther <agx@sigxcpu.org>  Fri, 18 Dec 2009 18:13:09 +0100
 
+icedove-nostalgy (0.2.16+svn151-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, Ubuntu remaining changes:
+    - Replace Icedove occurences with Thunderbird.
+    - Set binary package name to thunderbird-nostalgy.
+    - debian/install:
+      + s/icedove/thunderbird.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 15 May 2009 00:24:06 +0200
+
 icedove-nostalgy (0.2.16+svn151-1) unstable; urgency=low
 
   * [5af9a2f] merge 0.2.16+svn151
@@ -35,6 +62,16 @@ icedove-nostalgy (0.2.15+svn131-2) unsta
 
  -- Guido Guenther <agx@sigxcpu.org>  Wed, 23 Jul 2008 18:31:22 -0400
 
+icedove-nostalgy (0.2.15+svn131-1ubuntu1) intrepid; urgency=low
+
+  * debian/control: 
+    - change Icedove reference to Thunderbird
+    - Change binary package name from icedove-nostalgy to thunderbird-nostalgy
+  * debian/install: change icedove directory to thunderbird
+  * Closes LP: #284786
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Tue, 23 Sep 2008 20:37:59 +0000
+
 icedove-nostalgy (0.2.15+svn131-1) unstable; urgency=low
 
   * Initial release (Closes: #470731)
diff -pruN 0.2.22-3/debian/control 0.2.22-3ubuntu1/debian/control
--- 0.2.22-3/debian/control	2010-02-04 07:34:19.000000000 +0000
+++ 0.2.22-3ubuntu1/debian/control	2010-02-04 07:32:28.000000000 +0000
@@ -1,7 +1,8 @@
 Source: icedove-nostalgy
 Section: mail
 Priority: optional
-Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org>
 Uploaders: Guido Günther <agx@sigxcpu.org>
 Build-Depends: debhelper (>= 5), quilt, zip, cdbs
 Standards-Version: 3.8.3
@@ -11,12 +12,12 @@ Homepage: http://alain.frisch.fr/soft_mo
 
 Package: xul-ext-nostalgy
 Architecture: all
-Provides: icedove-nostalgy
-Depends: ${shlibs:Depends}, ${misc:Depends}, icedove (>= 1.5)
-Replaces: icedove-nostalgy (<< 0.2.22)
-Description: keyboard shortcut extension for icedove
+Provides: thunderbird-nostalgy
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunderbird (>= 1.5)
+Replaces: thunderbird-nostalgy (<< 0.2.22)
+Description: keyboard shortcut extension for thunderbird
  Nostalgy adds keyboard shortcuts to change the current folder, to move/copy
  selected messages into another folder, to add/remove/view tags; the selection
  of the target folder is made through an auto-completion box where you can type
  part of the folder name. There are also commands to improve the navigation
- between Icedove's three panes.
+ between Thunderbird's three panes.