--- bugmail-extension-1.6.1.orig/install.rdf
+++ bugmail-extension-1.6.1/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>3.1a1pre</em:maxVersion>
+        <em:maxVersion>3.1.*</em:maxVersion>
       </Description>
     </em:targetApplication>
    
--- bugmail-extension-1.6.1.orig/debian/rules
+++ bugmail-extension-1.6.1/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/mozilla-devscripts/xpi.mk
--- bugmail-extension-1.6.1.orig/debian/copyright
+++ bugmail-extension-1.6.1/debian/copyright
@@ -0,0 +1,20 @@
+Homepage and Upstream Contact
+===============================
+ Homepage: https://addons.mozilla.org/en-US/thunderbird/addon/9584
+ Upstream: Fabrice Desre <fabrice.desre@gmail.com>
+ Copyright: 2008 Fabrice Desre
+
+Source Location
+================
+ The source is obtained by downloading xpi file from Homepage, and then
+ unpacked by using med-xpi-unpack script, provided by mozilla-devscripts
+ package.
+
+License
+========
+ The source is licensed under GPL v3, as pointed out in LICENSE file provided
+ in the source tree.
+
+ On Debian systems, the complete text of the GNU General
+ Public License version 3can be found in 
+ `/usr/share/common-licenses/GPL-3'.
--- bugmail-extension-1.6.1.orig/debian/changelog
+++ bugmail-extension-1.6.1/debian/changelog
@@ -0,0 +1,54 @@
+bugmail-extension (1.6.1-0ubuntu4.10.04.1) lucid-security; urgency=low
+
+  * Bump maxVersion to 3.1.* to work with the latest Thunderbird
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 23 Nov 2010 13:48:24 +0000
+
+bugmail-extension (1.6.1-0ubuntu4) lucid; urgency=low
+
+  * Rebuild to pick up new features from mozilla-devscripts 0.21.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Mon, 12 Apr 2010 15:38:41 +0200
+
+bugmail-extension (1.6.1-0ubuntu3) lucid; urgency=low
+
+  * Correct transitional package dependencies to be satisfiable.
+
+ -- Ilya Barygin <barygin@gmail.com>  Sat, 06 Feb 2010 17:11:33 +0300
+
+bugmail-extension (1.6.1-0ubuntu2) lucid; urgency=low
+
+  [ Sasa Bodiroza <jazzva@gmail.com> ]
+  * Update debian/copyright, LICENSE file is present in the source tree.
+
+  [ Benjamin Drung <bdrung@ubuntu.com> ]
+  * Rename binary package from bugmail-extension to xul-ext-bugmail
+    according to new policy.
+  * Add missing ${misc:Depends}.
+  * Use new features from mozilla-devscripts 0.16 (LP: #430149).
+  * Bump Standards-Version to 3.8.3.
+  * Remove variables from debian/rules (not needed any more).
+  * Add debian/watch file.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 27 Jan 2010 15:41:31 +0100
+
+bugmail-extension (1.6.1-0ubuntu1) karmic; urgency=low
+
+  * New upstream release. (LP: 306836)
+  * Fix Maintainer field in debian/control as per
+    https://wiki.ubuntu.com/DebianMaintainerField
+  * Bump Standards-Version in debian/control to 3.8.2
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Mon, 03 Aug 2009 23:47:46 +0200
+
+bugmail-extension (1.6-0ubuntu1) karmic; urgency=low
+
+  * New upstream release.
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Mon, 03 Aug 2009 00:10:19 +0200
+
+bugmail-extension (1.3-0ubuntu1) jaunty; urgency=low
+
+  * Initial release.
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Wed, 10 Dec 2008 13:34:28 +0100
--- bugmail-extension-1.6.1.orig/debian/compat
+++ bugmail-extension-1.6.1/debian/compat
@@ -0,0 +1 @@
+5
--- bugmail-extension-1.6.1.orig/debian/watch
+++ bugmail-extension-1.6.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.mozilla.org/pub/mozilla.org/addons/9584/bugmail-([\d\.]*)-tb\+sm\.xpi
--- bugmail-extension-1.6.1.orig/debian/control
+++ bugmail-extension-1.6.1/debian/control
@@ -0,0 +1,28 @@
+Source: bugmail-extension
+Section: web
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sasa Bodiroza <jazzva@gmail.com>
+Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.16)
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/bugmail-extension.ubuntu/
+Standards-Version: 3.8.3
+Homepage: https://addons.mozilla.org/en-US/thunderbird/addon/9584
+
+Package: xul-ext-bugmail
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: ${xpi:Recommends}
+Provides: ${xpi:Provides}
+Enhances: ${xpi:Enhances}
+Replaces: bugmail-extension (<< 1.6.1-0ubuntu2)
+Description: Thunderbird/Seamonkey extension to add bug status to the mail
+ This extension adds bug status to the header pane. It currently supports
+ Bugzilla, Trac, Flyspray and Launchpad.
+
+Package: bugmail-extension
+Architecture: all
+Depends: xul-ext-bugmail, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package to ease the migration
+ from the bugmail-extension to the new xul-ext-bugmail package.
+ You can remove it safely.