diff -u firebug-1.3.3/debian/changelog firebug-1.3.3/debian/changelog
--- firebug-1.3.3/debian/changelog
+++ firebug-1.3.3/debian/changelog
@@ -1,3 +1,12 @@
+firebug (1.3.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #372819), remaining changes:
+    - Changes to debain/control to substitute iceweasel by firefox
+    - Changes in debian/rules to take into account new binary name
+    - Creation of debian/link, debian/docs and debian/install 
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Wed, 06 May 2009 13:12:41 -0500
+
 firebug (1.3.3-1) unstable; urgency=low
 
   * New upstream version.
@@ -13,12 +22,35 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Tue, 17 Feb 2009 10:50:06 +0300
 
+firebug (1.3.0-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #316986). Remaining Ubuntu changes:
+    - Changes to debain/control to substitute iceweasel by firefox
+    - Changes in debian/rules to take into account new binary name
+    - Creation of debian/link, debian/docs and debian/install
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Tue, 13 Jan 2009 22:30:59 +0100
+
 firebug (1.3.0-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Tue, 13 Jan 2009 17:07:00 +0300
 
+firebug (1.2.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian unstable (LP: #314962)
+  * debian/control: 
+    - Changed references of Iceweasel to Firefox
+    - Changed dependency on iceweasel to firefox | abrowser 
+      (also close LP: #272959)
+    - Changed binary name to firebug
+  * debian/rules: Changed tag name from makebuilddir/iceweasel-firebug to
+    makebuilddir/firebug::
+  * Created debian/links, debian/docs and debian/install from debian ones
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Thu, 08 Jan 2009 06:23:15 +0100
+
 firebug (1.2.1-1) unstable; urgency=low
 
   * New upstream bugfix-release.
@@ -78,0 +111,14 @@
+
+firebug (1.2~b21+svn573-0ubuntu1) hardy; urgency=low
+
+  * Import of new upstream source. (v1.2~b21+svn573)
+    - fixes serious firefox crashes in LP: #220562
+
+ -- Jared Greenwald <greenwaldjared@gmail.com>  Tue, 22 Apr 2008 15:04:27 -0400
+
+firebug (1.1.0~b11+svn317-0ubuntu2) hardy; urgency=low
+
+  * Initial release. (LP: #194375)
+
+ -- Jared Greenwald <greenwaldjared@gmail.com>  Thu, 21 Feb 2008 17:34:24 -0500
+
diff -u firebug-1.3.3/debian/rules firebug-1.3.3/debian/rules
--- firebug-1.3.3/debian/rules
+++ firebug-1.3.3/debian/rules
@@ -5,7 +5,7 @@
 clean::
 	rm -fr unpack not-install
 
-makebuilddir/iceweasel-firebug::
+makebuilddir/firebug::
 	rm -fr unpack not-install
 	mkdir -p unpack not-install
 	unzip -q *.xpi -d unpack
diff -u firebug-1.3.3/debian/control firebug-1.3.3/debian/control
--- firebug-1.3.3/debian/control
+++ firebug-1.3.3/debian/control
@@ -1,7 +1,8 @@
 Source: firebug
 Section: web
 Priority: optional
-Maintainer: Dmitry E. Oboukhov <unera@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dmitry E. Oboukhov <unera@debian.org>
 Build-Depends: cdbs, debhelper
 Build-Depends-Indep: unzip
 Standards-Version: 3.8.0
@@ -9,11 +10,11 @@
 VCS-Git: git://git.debian.org/collab-maint/firebug.git
 VCS-Browser: http://git.debian.org/?p=collab-maint/firebug.git;a=summary
 
-Package: iceweasel-firebug
+Package: firebug
 Architecture: all
-Depends: iceweasel (>= 3.0~rc1)
-Description: web development plugin for iceweasel
- Firebug integrates with Iceweasel to put a wealth of web  development  tools
+Depends: firefox (>= 3.0) | abrowser (>= 3.0)
+Description: web development plugin for Firefox
+ Firebug integrates with Firefox to put a wealth of web  development  tools
  at your fingertips while you browse. You can edit, debug, and monitor CSS,
  HTML, and JavaScript live in any web page. 
  .
only in patch2:
unchanged:
--- firebug-1.3.3.orig/debian/links
+++ firebug-1.3.3/debian/links
@@ -0,0 +1,2 @@
+usr/share/mozilla-extensions/firebug usr/lib/firefox-addons/extensions/firebug@software.joehewitt.com
+
only in patch2:
unchanged:
--- firebug-1.3.3.orig/debian/docs
+++ firebug-1.3.3/debian/docs
@@ -0,0 +1 @@
+not-install/docs/*
only in patch2:
unchanged:
--- firebug-1.3.3.orig/debian/install
+++ firebug-1.3.3/debian/install
@@ -0,0 +1 @@
+unpack/* 	/usr/share/mozilla-extensions/firebug