diff -u imagezoom-0.3.1/debian/changelog imagezoom-0.3.1/debian/changelog
--- imagezoom-0.3.1/debian/changelog
+++ imagezoom-0.3.1/debian/changelog
@@ -1,3 +1,25 @@
+imagezoom (0.3.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #227577):
+    - Repackaged using XPI.TEMPLATE
+    - In debian/rules:
+      - added build/mozilla-imagezoom rule to make a imagezoom.xpi file
+      - added clean rule to cleanup the imagezoom.xpi file
+    - Add thunderbird support (LP: #154778)
+      - Modify MOZ_XPI_MOZILLA_DIRS in debian/rules
+      - Add thunderbird as an optional dependency in debian/control
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Sat, 07 Jun 2008 18:27:53 -0500
+
+imagezoom (0.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Boosted standards to 3.7.3 (no change is needed)
+  * Homepage is in the control field
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Mon, 31 Mar 2008 20:24:30 -0400
+
 imagezoom (0.3.1-0ubuntu1) hardy; urgency=low
 
   * New upstream release (LP: #209990)
@@ -157,0 +180 @@
+
diff -u imagezoom-0.3.1/debian/control imagezoom-0.3.1/debian/control
--- imagezoom-0.3.1/debian/control
+++ imagezoom-0.3.1/debian/control
@@ -6,10 +6,11 @@
 Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.5~), zip
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozilla-imagezoom.ubuntu/
 Standards-Version: 3.7.3
+Homepage: http://imagezoom.yellowgorilla.net
 
 Package: mozilla-imagezoom
 Architecture: all
-Depends: firefox | firefox-3.0 | firefox-2
+Depends: firefox | firefox-3.0 | firefox-2 | thunderbird
 Description: Mozilla context menu option to zoom current image
  Easy to use extension that works with Firefox, Mozilla and Thunderbird.
  .
@@ -30,2 +30,0 @@
- .
- Project website: http://imagezoom.yellowgorilla.net
diff -u imagezoom-0.3.1/debian/rules imagezoom-0.3.1/debian/rules
--- imagezoom-0.3.1/debian/rules
+++ imagezoom-0.3.1/debian/rules
@@ -17,6 +17,8 @@
 # found in the top level directory
 #MOZ_XPI_BUILD_COMMAND = sh build.sh
 
+MOZ_XPI_MOZILLA_DIRS := firefox-addons firefox thunderbird
+
 build/mozilla-imagezoom::
 	cd chrome ; zip -r imagezoom.jar * ; cd .. ;
 	zip -r imagezoom.xpi . -i chrome/imagezoom.jar defaults/\* * -x debian/\* temp-xpi-\*