diff -u icedove-dispmua-1.6.2/debian/changelog icedove-dispmua-1.6.2/debian/changelog
--- icedove-dispmua-1.6.2/debian/changelog
+++ icedove-dispmua-1.6.2/debian/changelog
@@ -1,3 +1,15 @@
+icedove-dispmua (1.6.2-1ubuntu1) jaunty; urgency=low
+
+  * debian/control: 
+      - Changed references from icedove to thunderbird
+      - Changed binary package name to dispmua
+      - Added Replaces and Conflicts on thunderbird-dispmua (package name in
+        Intrepid)
+  * debian/install: substitute icedove by thunderbird
+  * Closes LP: #296618
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Tue, 11 Nov 2008 05:00:11 +0000
+
 icedove-dispmua (1.6.2-1) unstable; urgency=low
 
   * New Upstream Version
diff -u icedove-dispmua-1.6.2/debian/install icedove-dispmua-1.6.2/debian/install
--- icedove-dispmua-1.6.2/debian/install
+++ icedove-dispmua-1.6.2/debian/install
@@ -1,4 +1,4 @@
-build/chrome.jar  usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/
-chrome.manifest  usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
-install.rdf      usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
-defaults/        usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
+build/chrome.jar  usr/lib/thunderbird/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/
+chrome.manifest  usr/lib/thunderbird/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
+install.rdf      usr/lib/thunderbird/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
+defaults/        usr/lib/thunderbird/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
diff -u icedove-dispmua-1.6.2/debian/control icedove-dispmua-1.6.2/debian/control
--- icedove-dispmua-1.6.2/debian/control
+++ icedove-dispmua-1.6.2/debian/control
@@ -1,16 +1,19 @@
 Source: icedove-dispmua
 Section: mail
 Priority: optional
-Maintainer: Christoph Goehre <christoph.goehre@gmx.de>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Goehre <christoph.goehre@gmx.de>
 Build-Depends: debhelper (>= 4.0.0), quilt
 Build-Depends-Indep: zip
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.0
 
-Package: icedove-dispmua
+Package: dispmua
 Architecture: all
-Depends: icedove (>= 1.5.0.7), icedove (<= 2.0.0.99)
-Description: display Mail User Agent extension for Icedove
+Depends: thunderbird (>= 1.5.0.7), thunderbird (<= 2.0.0.99)
+Conflicts: thunderbird-dispmua
+Replaces: thunderbird-dispmua
+Description: display Mail User Agent extension for thunderbird
  Adds an image on the right side of the "expanded header view" which displays
  the icon of the application with which the currently selected mail was
  written.