only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/install.rdf
+++ ubufox-0.7~rc1/install.rdf
@@ -17,7 +17,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
         <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>3.0.*</em:maxVersion>
+        <em:maxVersion>3.6.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/rules
+++ ubufox-0.7~rc1/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+# name the package (as in debian/control) that will ship the extension
+MOZ_EXTENSION_PKG := ubufox
+#
+# xpi.mk will auto detect the .xpi in your package. if you want to do it
+# explicit, use this variable
+#MOZ_XPI_FILE := yourextension.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 = sh build.sh
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/mozilla-devscripts/xpi.mk
+
+common-install-indep::
+	dh_install -pubufox debian/ubufox.js etc/firefox-3.0/pref/
+	dh_link -pubufox /etc/firefox-3.0/pref/ubufox.js /usr/share/ubufox/defaults/preferences/000system.js
+
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/compat
+++ ubufox-0.7~rc1/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/copyright
+++ ubufox-0.7~rc1/debian/copyright
@@ -0,0 +1,17 @@
+This is the Ubuntu package of ubufox.
+It was packaged by Alexander Sack <asac@ubuntu.com>
+
+the upstream sources can be found at:
+
+https://code.launchpad.net/~asac/ubufox/main
+
+Copyright for upstream sources and debian packaging:
+
+Copyright (C) 2007 Canonical Ltd.
+
+License:
+GNU GENERAL PUBLIC LICENSE Version 2, June 1991 or any later
+
+The full text can be found at:
+  /usr/share/common-licenses/GPL or http://www.gnu.org/licenses/gpl.txt
+
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/ubufox.js
+++ ubufox-0.7~rc1/debian/ubufox.js
@@ -0,0 +1,9 @@
+
+// Place your global firefox preferences in this file if you are using
+// ubufox. Especially those preferences defined in ubufox need to be configured
+// here to become effective.
+
+
+// Example: Homepage
+//pref("browser.startup.homepage", "file:/usr/share/doc/ubufox/example-homepage.properties");
+
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/docs
+++ ubufox-0.7~rc1/debian/docs
@@ -0,0 +1 @@
+debian/example-homepage.properties
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/control
+++ ubufox-0.7~rc1/debian/control
@@ -0,0 +1,18 @@
+Source: ubufox
+Section: web
+Priority: optional
+Maintainer: Alexander Sack <asac@ubuntu.com>
+Build-Depends: debhelper (>= 5), cdbs, quilt, mozilla-devscripts, zip
+XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubufox/ubuntu/
+Standards-Version: 3.7.2.1
+
+Package: ubufox
+Architecture: all
+Depends: firefox | abrowser | firefox-3.0 | firefox-2, apturl (>= 0.1.2ubuntu1)
+Description: Ubuntu Firefox specific configuration defaults and apt support
+ Extension package for Firefox provides ubuntu specific configuration defaults
+ as well as apt support for firefox plugins/extensions.
+ .
+ You can uninstall this package if you prefer to use a pristine firefox
+ install.
+
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/preinst
+++ ubufox-0.7~rc1/debian/preinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if test "$1" = "upgrade" -o "$1" = "install"; then 
+  if test -d /usr/lib/firefox/extensions/ubufox@ubuntu.com; then
+    rm -rf /usr/lib/firefox/extensions/ubufox@ubuntu.com
+  fi
+
+  if test -d /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com; then
+    rm -rf /usr/lib/firefox-addons/extensions/ubufox@ubuntu.com
+  fi
+fi
+
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/example-homepage.properties
+++ ubufox-0.7~rc1/debian/example-homepage.properties
@@ -0,0 +1,2 @@
+# to test, just enable the example homepage pref in /etc/firefox-3.0/pref/ubufox.js
+browser.startup.homepage=http://www.ubuntu.com
only in patch2:
unchanged:
--- ubufox-0.7~rc1.orig/debian/changelog
+++ ubufox-0.7~rc1/debian/changelog
@@ -0,0 +1,312 @@
+ubufox (0.7~rc1-0ubuntu2) jaunty; urgency=low
+
+  * install.rdf: Updated the max version to 3.6.0 
+
+ -- John Vivirito <gnomefreak@ubuntu.com>  Thu, 02 Apr 2009 16:07:10 -0400
+
+ubufox (0.7~rc1-0ubuntu1) jaunty; urgency=low
+
+  * new upstream release 0.7rc1 for jaunty
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 19 Mar 2009 00:02:39 +0100
+
+ubufox (0.7~b1-0ubuntu1) jaunty; urgency=low
+
+  * new upstream snapshot 0.7b1 for jaunty
+  * add .bzr-builddeb/default.conf and define proper upstream revid for
+    easy tarball export
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 18 Feb 2009 21:41:40 +0100
+
+ubufox (0.6-0ubuntu3) UNRELEASED; urgency=low
+
+  * LP: #281348 - Firefox only shows default icons in toolbars with tabmixplus
+    and ubufox installed; we cherry pick rev 148 from lp:ubufox tree
+    - update content/alternatePlugins.js
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 02 Dec 2008 01:34:17 +0100
+
+ubufox (0.6-0ubuntu2) jaunty; urgency=low
+
+    + LP: #291417 - Installing Plugins on LiveCD - No description found in
+      plugin database; we fix distributionID in pfs.datasource.url pref.
+      - update defaults/preferences/ubufox-pfs.js
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 01 Dec 2008 11:43:28 +0100
+
+ubufox (0.6-0ubuntu1) intrepid; urgency=low
+
+  * ubufox release 0.6 (lp:ubufox / bzr 145)
+    + point gethelp and translate help menu entries to intrepid
+      - update content/overlay.js
+    + Fix LP: #283517; ubufox 0.6pre lacks translations for new strings;
+      update all translations sent in for 0.6 release; thanks to all
+      translators and a special thank to Saïvann Carignan <oxmosys@gmail.com>
+      for his work on verifying and driving the contributions.
+
+  * fix LP: #259914 - prefs in ubufox extension override system prefs;
+    to fix we ship /etc/firefox-3.0/pref/ubufox.js where admins can place their
+    system prefs and link it properly to the global ubufox defaults
+    preferences directory
+    - add debian/ubufox.js
+    - update debian/rules
+  * more for fix LP: #259914: we ship proper example for global homepage and
+    adjust the example in the global ubufox.js accordingly
+    - add debian/docs
+    - add debian/example-homepage.properties
+    - update debian/ubufox.js
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 21 Oct 2008 16:29:49 +0200
+
+ubufox (0.6~pre+bzr141-0ubuntu1) intrepid; urgency=low
+
+  * ubufox release candidate 0.6 (lp:ubufox / bzr 139);
+  * New features in ubufox 0.6:
+    - firefox restart notification on upgrade
+    - improved plugin wizard
+    - plugin alternative wizard lets you select a preferred plugin
+      for a specific mime-type
+  * elminate all cherry picked changes since beta1
+    - (cherry-pick rev 111 from lp:ubufox)
+    - (cherry-pick rev 112 from lp:ubufox)
+    - (cherry-pick rev 113 from lp:ubufox)
+    - (cherry-pick rev 114 from lp:ubufox)
+    - (cherry-pick rev 116 from lp:ubufox)
+    - (cherry-pick rev 115 from lp:ubufox)
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 15 Oct 2008 00:34:23 +0200
+
+ubufox (0.6~b1-0ubuntu4) intrepid; urgency=low
+
+  (cherry-pick rev 116 from lp:ubufox)
+  * fix LP: #273948 - restart notification broken for locales that lack
+    restart notification string translation; we put 'restart' notification
+    strings in their own .properties file to prevent breakage due to partial
+    ubufox.properties files for non en-US languages and adjust files that
+    refernce the new strings accordingly.
+    - add locale/en-US/ubufox-restart.properties
+    - update content/updateRestart.js
+    - update content/updateRestart.xul
+    - update locale/en-US/ubufox.properties
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 24 Sep 2008 18:50:51 +0200
+
+ubufox (0.6~b1-0ubuntu3) intrepid; urgency=low
+
+  (cherry-pick rev 112 from lp:ubufox)
+  * fix LP: #269656 - AN IRRELEVANT LICENSE IS PRESENTED TO YOU
+    FREE-OF-CHARGE ON STARTUP; we backout the infamous firstrun feature 
+    (reverse apply rev 103)
+    - update content/overlay.js
+    - update defaults/preferences/ubufox.js
+    - remove content/mozeula.html
+
+  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
+    (meta-package) must alternatively Depend/Recommend/Suggest abrowser
+    - update debian/control
+
+  (cherry-pick rev 113 from lp:ubufox)
+  * set all translations for startup.homepage_override_url and
+    startup.homepage_welcome_url to about:blank; this prevents firstrun
+    and milestone pages to appear
+    - update locale/*/ubufox.properties
+
+  (cherry-pick rev 114 from lp:ubufox)
+  * HOMEPAGE_ONLINE now points to ubuntu 8.10 release startpage
+    - update content/startpage.html
+
+  (cherry-pick rev 115 from lp:ubufox)
+  * dont make alternate plugin binding break flashblock; our
+    bindings are not \!important anymore
+    - update content/alternatePluginsBinding.css
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 23 Sep 2008 17:48:53 +0200
+
+ubufox (0.6~b1-0ubuntu2) intrepid; urgency=low
+
+  (cherry-pick rev 111 from lp:ubufox)
+  * reintroduce general.useragent.locale pref dropped in 0.6~b1.
+    Without that pref the current startpage.html
+    breaks and displays a blank page. LP: #271443
+    - update defaults/preferences/ubuntu-mods.js
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 17 Sep 2008 20:53:43 +0200
+
+ubufox (0.6~b1-0ubuntu1) intrepid; urgency=low
+
+  [ Luis Arias ]
+  * MERGE 0.6~b1 release from lp:ubufox
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 12 Sep 2008 12:02:19 +0200
+
+ubufox (0.5-0ubuntu1) hardy; urgency=low
+
+  * bump version to 0.5 final
+    - update install.rdf
+
+ -- Alexander Sack <asac@ubuntu.com>  Sun, 20 Apr 2008 14:17:40 +0200
+
+ubufox (0.5~rc2-0ubuntu1) hardy; urgency=low
+
+  * New ubufox release 0.5~rc2:
+    - ships a hybrid startpage that reliably detects online/offline state
+      and redirects to online/offline version of startpage accordingly.
+    - use distributionID in pfs url to allow plugin finder web service to
+      return distinct results depending on the distro the user is running.
+    - add uk (ukrainian) translation
+    - fix locale mapping for italian language (LP: #212446) by Damiano
+      Dallatana
+      + update chrome.manifest
+ 
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 14 Apr 2008 09:59:02 +0200
+
+ubufox (0.5~rc1-0ubuntu1) hardy; urgency=low
+
+  Upstream Changes integrated
+  * make apturl dependency versioned (>= 0.1.2ubuntu1) - LP: #162609
+  * multi distro capability of DB creation script and web service
+    (LP: #204435, #177514)
+  * simplify ffox 3 code for dispatching NewPluginInstalled events
+  * fix plugin Installer Wizard for ffox 3 (LP: #202790)
+  * point ubufoxReportBug to firefox-3.0 source package
+  * point online help and translate menu entry to firefox-3.0 package and hardy
+    distribution (LP: #138968, #203729)
+  * merge greek-translation contributed by Athanasios Lefteris
+  * LP: #139380, #175969 - merge translations contributed by ubuntu community;
+    thanks to Saïvann Carignan for his work on collecting and integrating most
+    of them.
+    - Added Greek locale - submitted by Athanasios Lefteris (LP: #211404)
+    - add Slovenian locale
+    - add Swedish locale (LP: #207666)
+    - add Portuguese locale
+    - add Lithuanian locale (LP: #206133)
+    - add Italian locale (LP: #207372)
+      + fix mispelled word in Italian translation
+    - add Afrikaans locale (LP: #206733)
+    - add fr-FR and fr-CA translations
+    - add polish translations (LP: #202248)
+  * merge fix for LP: #176658 - by Saïvann Carignan <oxmosys@gmail.com>
+    - fix ubufox to use the png icon
+
+  Package changes:
+  * append &distributionID=8.04 to pfs.datasource.url shipped as defaults
+    preference
+    - update defaults/preferences/ubufox-pfs.js
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 05 Apr 2008 06:35:40 +0200
+
+ubufox (0.5~beta2.1-0ubuntu1) hardy; urgency=low
+
+  * merge 0.5 beta 2.1 from upstream branch
+   - backout hybrid startup page to fix alternating home page for users with
+     high latency connections
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 13 Mar 2008 22:15:39 +0100
+
+ubufox (0.5~beta2-0ubuntu3) hardy; urgency=low
+
+  * remove ubufox@ubuntu.com directories in /usr/lib/firefox/extensions
+    and /usr/lib/firefox-addons/extensions to prepare the install of links
+    to /usr/share/ubufox/ instead
+    - add debian/preinst
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 13 Mar 2008 16:59:38 +0100
+
+ubufox (0.5~beta2-0ubuntu2) hardy; urgency=low
+
+  * fix ftbfs: add zip to build dependencies
+    - update debian/control
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 13 Mar 2008 15:40:37 +0100
+
+ubufox (0.5~beta2-0ubuntu1) hardy; urgency=low
+
+  * new upstream release v0.5 beta2
+    - includes ask.com as searchplugin
+    - redirects to (localized) hybrid igoogle default startpage if user is
+      online.
+  * switch to mozilla-devscripts xpi.mk for building this extension
+    - update debian/control
+    - update debian/rules
+  * xpi.mk automizes all; drop debhelper files
+    - remove debian/ubufox.install
+    - remove debian/ubufox.dirs
+  * added translations fi-FI and ru-RU (thanks to Daniel Abramov)
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 13 Mar 2008 12:19:52 +0100
+
+ubufox (0.5~beta1-0ubuntu1) hardy; urgency=low
+
+  * support firefox 3 and 2 from the same package
+    - update debian/ubufox.dirs
+    - update debian/ubufox.install
+    - update debian/control
+  * drop All patches shipped in ubuntu diff.gz
+    - drop debian/patches/lp139380_ubufox_add_finnish_translation.patch
+    - drop debian/patches/lp134426_prepatch_fix_pluginfinder_runs_forever.patch
+    - drop debian/patches/lp123713_addon_description_fix.patch
+    - drop debian/patches/fix_broken_radiobutton_command.patch
+    - update debian/patches/series
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 13 Feb 2008 18:53:15 +0100
+
+ubufox (0.4~beta1-0ubuntu4) gutsy; urgency=low
+
+  * Improve Description of package/extension (LP: #123713):
+    - debian/patches/lp123713_addon_description_fix.patch,series: patch
+      install.rdf to improve description in addons dialog.
+    - debian/control: improve package description.
+  * debian/patches/lp139380_ubufox_add_finnish_translation.patch,series:
+    - add finish translation to ubufox (LP: #139380).
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 08 Oct 2007 14:29:05 +0200
+
+ubufox (0.4~beta1-0ubuntu3) gutsy; urgency=low
+
+  * debian/rules, debian/control, debian/patches/: setup quilt patchsystem for
+    ubuntu package.
+  * debian/patches/lp134426_prepatch_fix_pluginfinder_runs_forever.patch,
+    debian/patches/series: fix pluginfinder runs forever (LP: #134426); patch
+    by Sasa Bodiroza <jazzva@gmail.com>.
+  * debian/patches/fix_broken_radiobutton_command.patch, debian/patches/series:
+    add patch that fixes broken plugin selection - prefetched from ubufox
+    development branch.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 27 Aug 2007 11:26:13 +0200
+
+ubufox (0.4~beta1-0ubuntu2) gutsy; urgency=low
+
+  * debian/control: add apturl as binary depends
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 16 Aug 2007 20:53:49 +0200
+
+ubufox (0.4~beta1-0ubuntu1) gutsy; urgency=low
+
+  * ubufox 0.4~beta1 release that ships features for
+    https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support:
+    - new plugin finder wizard that allows to install apt packages
+    - new "Get Ubuntu Addons" link in Tools -> Addons dialog that will
+      bring up gnome-app-install with available xul-extension packages.
+  * credits go to Sasa Bodiroza <jazzva@gmail.com> who helped
+    implementing 0.4~beta1 features.
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 16 Aug 2007 15:12:56 +0200
+
+ubufox (0.3-0ubuntu1) gutsy; urgency=low
+
+  * ubufox 0.3 featuring ubuntu help menu overlays
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 31 Jul 2007 13:35:25 +0000
+
+ubufox (0.2-0ubuntu2) gutsy; urgency=low
+
+  * defaults/preferences/ubuntu-mods.js: reestablish ubuntu
+    behaviour ... ensure that new links are opened in tabs" 
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 19 Jul 2007 11:32:01 +0200
+
+ubufox (0.2-0ubuntu1) gutsy; urgency=low
+
+  * Initial release of ubufox extension package.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 02 Jul 2007 16:20:20 +0200