diff -u diggler-0.9/debian/control diggler-0.9/debian/control
--- diggler-0.9/debian/control
+++ diggler-0.9/debian/control
@@ -1,14 +1,16 @@
 Source: diggler
 Priority: optional
 Section: web
-Maintainer: Mike Hommey <glandium@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Original-Maintainer: Mike Hommey <glandium@debian.org>
 Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.7.2.2
+Standards-Version: 3.8.0
+Homepage: http://diggler.mozdev.org/
 
 Package: mozilla-diggler
 Architecture: all
-Depends: iceweasel | iceape-browser
-Description: A set of URL manipulation utilities for Iceape and Iceweasel's location bar
+Depends: firefox-2 | seamonkey-browser
+Description: A set of URL manipulation utilities for Seamonkey and Firefox's location bar
  Diggler adds a button next to the location bar which can clear the
  location bar (much like the one in Konqueror) but also drops down a
  menu with some useful actions such as being able to disable popup
diff -u diggler-0.9/debian/links diggler-0.9/debian/links
--- diggler-0.9/debian/links
+++ diggler-0.9/debian/links
@@ -3,0 +4 @@
+usr/share/mozilla-extensions/diggler usr/lib/firefox/extensions/{583102ea-1697-4aee-bd9b-9757892e6a5b}
diff -u diggler-0.9/debian/changelog diggler-0.9/debian/changelog
--- diggler-0.9/debian/changelog
+++ diggler-0.9/debian/changelog
@@ -1,9 +1,48 @@
+diggler (0.9-16ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #254614)
+  * properly install extension in firefox/extensions directory and 
+    switch
+    depends to firefox 2 as we are not yet compatible (LP: #217993) with 
+    ffox 3
+    - update debian/control
+    - update debian/links
+  * install.rdf: Allow to use with Iceweasel 3.0.x.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 09 Aug 2008 16:26:27 +0530
+
 diggler (0.9-15) unstable; urgency=low
 
   * install.rdf: Allow to use with Iceweasel 3.0.
 
  -- Mike Hommey <glandium@debian.org>  Mon, 16 Jun 2008 00:55:00 +0200
 
+diggler (0.9-14ubuntu3) hardy; urgency=low
+
+  * properly install extension in firefox/extensions directory and switch
+    depends to firefox 2 as we are not yet compatible (LP: #217993) with ffox 3
+    - update debian/control
+    - update debian/links
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 16 Apr 2008 03:43:51 +0200
+
+diggler (0.9-14ubuntu2) hardy; urgency=low
+
+  * Changed package description to mention Firefox/Seamonkey (LP: #184084)
+  * Replace mozilla-browser in Depends with seamonkey-browser
+  * Bump Debian standards version to 3.7.3
+  * debian/control: Add Homepage field
+
+ -- David Futcher <bobbocanfly@gmail.com>  Sat, 29 Mar 2008 11:43:55 +0000
+
+diggler (0.9-14ubuntu1) feisty; urgency=low
+
+  * Changed depends from iceweasel | iceape-browser to firefox | mozilla-browser
+  * debian/control: Changed Maintainer field to ubuntu motu address and added
+    original-maintainer field with the debian maintainer
+
+ -- Stephan Hermann <sh@sourcecode.de>  Wed, 17 Jan 2007 10:37:53 +0100
+
 diggler (0.9-14) unstable; urgency=low
 
   * debian/copyright: Include the MPL license text instead of pointing to