--- webdeveloper-1.1.5.orig/build.xml
+++ webdeveloper-1.1.5/build.xml
@@ -84,7 +84,7 @@
         <copy file="default_install.rdf" tofile="install.rdf">
             <filterset refid="common.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper.xpi">
+        <zip destfile="webdeveloper.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -158,7 +158,7 @@
         <copy file="default_install.rdf" tofile="install.rdf">
             <filterset refid="seamonkey.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-seamonkey.xpi">
+        <zip destfile="webdeveloper-seamonkey.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -228,7 +228,7 @@
         <copy file="localized_install.rdf" tofile="install.rdf">
             <filterset refid="common.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-localized.xpi">
+        <zip destfile="webdeveloper-localized.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -302,7 +302,7 @@
         <copy file="localized_install.rdf" tofile="install.rdf">
             <filterset refid="seamonkey.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-seamonkey-localized.xpi">
+        <zip destfile="webdeveloper-seamonkey-localized.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -372,7 +372,7 @@
         <copy file="no_updates_install.rdf" tofile="install.rdf">
             <filterset refid="common.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-no-updates.xpi">
+        <zip destfile="webdeveloper-no-updates.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -446,7 +446,7 @@
         <copy file="no_updates_install.rdf" tofile="install.rdf">
             <filterset refid="seamonkey.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-seamonkey-no-updates.xpi">
+        <zip destfile="webdeveloper-seamonkey-no-updates.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -516,7 +516,7 @@
         <copy file="default_install.rdf" tofile="install.rdf">
             <filterset refid="common.filters"/>
         </copy>
-        <zip destfile="builds/webdeveloper-test-localized.xpi">
+        <zip destfile="webdeveloper-test-localized.xpi">
             <zipfileset dir="chrome" prefix="chrome"/>
             <zipfileset file="chrome.manifest"/>
             <zipfileset file="install.js"/>
@@ -542,4 +542,4 @@
             <filterset refid="all.filters"/>
         </copy>
     </target>
-</project>
\ No newline at end of file
+</project>
--- webdeveloper-1.1.5.orig/debian/changelog
+++ webdeveloper-1.1.5/debian/changelog
@@ -0,0 +1,109 @@
+webdeveloper (1.1.5-0ubuntu2) hardy; urgency=low
+
+  * Merged upstream version. (v1.1.5) (LP: #204124)
+    - Support for Firefox 3.
+  * Changed to new mozilla-devscripts xpi build
+    - updated debian/rules
+    - removed debian/firefox-webdeveloper.*
+  * Changed copyright to include new GPLv3 license.
+    - updated debian/copyright
+  * Consolodated build and install deps.
+    - updated debian/control
+  * Moved built xpi files to top of tree.
+    - updated build.xml
+
+  [ Alexander Sack ]
+  * reference GPL-2 in /usr/share/common-licenses instead of shipping full
+    license text in copyright
+    - update debian/copyright
+
+ -- Jared Greenwald <greenwaldjared@gmail.com>  Wed, 19 Mar 2008 16:29:55 -0400
+
+webdeveloper (1.0.2+0-2ubuntu2) hardy; urgency=low
+
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification (LP: #176994).
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Tue, 18 Dec 2007 18:00:51 +0100
+
+webdeveloper (1.0.2+0-2ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable.
+  * Ubuntu changes dropped:
+    - Bumped firefox dep to 2.0 to fix ftbfs
+  * Run s/iceweasel/firefox/gi over debian/*, and renamed some files back.
+  * Renamed the binary package back to firefox-webdeveloper, and the
+    transitional package to mozilla-firefox-webdeveloper.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sun, 24 Dec 2006 21:44:09 +1100
+
+webdeveloper (1.0.2+0-2) unstable; urgency=low
+
+  * Updates of packaging for Firefox/Iceweasel rename:
+    - Renamed binary package to iceweasel-webdeveloper
+    - Added transition package
+    - Replaces instances of "Firefox" to "Iceweasel"
+
+ -- Michael Spang <mspang@uwaterloo.ca>  Sat, 25 Nov 2006 20:46:17 -0500
+
+webdeveloper (1.0.2+0-1) unstable; urgency=low
+
+  * New upstream release (rerelease of 1.0.2 with additional
+    locales and support for Firefox 2.0)
+  * Migrated to upstream's build infrastructure
+  * Moved webdeveloper into /usr/share; symlinked from extension directory
+  * Removed mozilla-firefox-webdeveloper transitional package
+  * Bumped Standards-Version to 3.7.2 (no changes required)
+
+ -- Michael Spang <mspang@uwaterloo.ca>  Fri, 10 Nov 2006 02:24:10 -0500
+
+webdeveloper (1.0.2-1ubuntu1) edgy; urgency=low
+
+  * Bumped firefox dep to 2.0 to fix ftbfs
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 24 Oct 2006 19:36:44 +1000
+
+webdeveloper (1.0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Michael Spang <mspang@twcny.rr.com>  Sun,  5 Feb 2006 21:04:37 -0500
+
+webdeveloper (0.9.4-2) unstable; urgency=low
+
+  * Renamed binary package to firefox-webdeveloper, source to webdeveloper
+  * Packaging updated to reflect rename of firefox from "mozilla-firefox"
+    to "firefox" (Closes: #343743)
+  * Removed all files obsoleted by Firefox 1.5
+  * Added transitional package for rename
+
+ -- Michael Spang <mspang@twcny.rr.com>  Sun, 18 Dec 2005 01:06:13 -0500
+
+mozilla-firefox-webdeveloper (0.9.4-1) unstable; urgency=low
+
+  * New upstream release (support for 1.5 beta included)
+  * Bug fix: "mozilla-firefox-webdeveloper: postinst is broken",
+    patch thanks to Mike Hommey (Closes: #329413)
+
+ -- Michael Spang <mspang@twcny.rr.com>  Mon,  7 Nov 2005 14:57:07 -0500
+
+mozilla-firefox-webdeveloper (0.9.3-4) unstable; urgency=low
+
+  * Moved debhelper back to Build-Depends for clean rule
+
+ -- Michael Spang <mspang@twcny.rr.com>  Mon, 19 Sep 2005 14:56:07 -0400
+
+mozilla-firefox-webdeveloper (0.9.3-3) unstable; urgency=low
+
+  * Changed Build-Depends to Build-Depends-Indep
+  * Expanded description to include a short list of important features (Closes: #324626)
+
+ -- Michael Spang <mspang@twcny.rr.com>  Tue, 23 Aug 2005 02:40:18 -0400
+
+mozilla-firefox-webdeveloper (0.9.3-2) unstable; urgency=low
+
+  * Initial release (Closes: #323148)
+  * Fixed cruft in copyright
+
+ -- Michael Spang <mspang@twcny.rr.com>  Wed, 17 Aug 2005 15:05:53 -0400
+
--- webdeveloper-1.1.5.orig/debian/copyright
+++ webdeveloper-1.1.5/debian/copyright
@@ -0,0 +1,19 @@
+Homepage and Upstream Contact
+===============================
+ Homepage: http://chrispederick.com/work/web-developer/
+ Upstream Contact: website@chrispederick.com
+ Originally debianized by Michael Spang <mspang@twcny.rr.com> on
+  Thu, 21 Jul 2005 13:55:29 -0400.
+
+Source Location
+================
+ cvs -d :pserver:guest@mozdev.org:/cvs login #pw="guest"
+ cvs -d :pserver:guest@mozdev.org:/cvs co webdeveloper
+
+ * use webdeveloper/development as top of source tree
+
+License
+========
+
+ * /usr/share/common-licenses/GPL-2
+
--- webdeveloper-1.1.5.orig/debian/compat
+++ webdeveloper-1.1.5/debian/compat
@@ -0,0 +1 @@
+5
--- webdeveloper-1.1.5.orig/debian/control
+++ webdeveloper-1.1.5/debian/control
@@ -0,0 +1,30 @@
+Source: webdeveloper
+Section: devel
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Spang <mspang@uwaterloo.ca>
+Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.5~), ant
+Standards-Version: 3.7.2
+
+Package: firefox-webdeveloper
+Architecture: all
+Depends: firefox | firefox-3.0 | firefox-2
+Description: web developer extension for the Firefox web browser
+ The Web Developer extension adds a toolbar to Firefox with numerous
+ features aimed at web developers. There are buttons to disable
+ various browser features (Java, JavaScript, images), to view, edit,
+ and disable stylesheets, to manipulate web forms, to view the
+ topography of a page, to display tag details, to view the headers
+ of a request, to clear the cache, cookies, and history, to view
+ comments, to zoom, to outline selected classes of tags, to resize
+ the browser to match a target resolution, and more. There are also
+ buttons for easy access to the page's source, to many web validation
+ services, and to important web standards documents.
+
+Package: mozilla-firefox-webdeveloper
+Architecture: all
+Depends: firefox-webdeveloper
+Description: web developer extension (transitional package)
+ The Web Developer package has been renamed to firefox-webdeveloper.
+ This is a transitional package which can be safely removed.
+
--- webdeveloper-1.1.5.orig/debian/rules
+++ webdeveloper-1.1.5/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+# name the package (as in debian/control) that will ship the extension
+MOZ_EXTENSION_PKG := firefox-webdeveloper
+
+# xpi.mk will auto detect the .xpi in your package. if you want to do it
+# explicit, use this variable
+MOZ_XPI_FILE := webdeveloper.xpi
+
+# xpi.mk tries to auto detect the extension manager id (em:id) from the .xpis
+# install.rdf file. There might be cases where this doesn't work. use the following
+# variable to explicitly define an extension ID and disable auto detection
+#MOZ_EM_ID := {xxxxxxx-xxxx-xxxx}
+
+# xpi.mk will run a build command before packaging an .xpi file. you can use this
+# to produce an .xpi. if you define this, the clean rule will remove any .xpi file
+# found in the top level directory
+MOZ_XPI_BUILD_COMMAND = ant
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/mozilla-devscripts/xpi.mk
+