lp:~oem-solutions-group/firefox/firefox-3.0.belmont

Created by Nicolas Valcarcel on 2009-11-06 and last modified on 2010-07-07
Get this branch:
bzr branch lp:~oem-solutions-group/firefox/firefox-3.0.belmont
Members of OEM Solutions Group can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
OEM Solutions Group
Project:
Mozilla Firefox
Status:
Development

Recent revisions

225. By Nicolas Valcarcel on 2010-07-07

Rebase Merge

224. By Nicolas Valcarcel on 2010-07-07

rebase branch

223. By Nicolas Valcarcel on 2010-07-07

add missing postinst

222. By Nicolas Valcarcel on 2010-07-07

add missing debian/firefox-3.0.preinst

221. By Nicolas Valcarcel on 2010-06-30

add debian/mozclient

220. By Nicolas Valcarcel on 2010-06-30

* Merged with hardy-security. Remaining changes:
  - Added script for fixing default directory issues.
* Removed firefox-branding from firefox Dependencies
* Removed no_firefox_is_running_message.diff
* Removed netbook_branding.patch
* Fix LP: #600022 - don't ship files which conflict with the Firefox 2
  package. Revert the change to install the preferences in /etc/firefox
  and add some logic to move them back again. Install the icon as
  firefox-3.0.png.
  - update debian/firefox-3.0.preinst
  - update debian/firefox-final.desktop
  - update debian/firefox-minefield.desktop
  - update debian/firefox-namoroka.desktop
  - update debian/firefox.install
  - update debian/firefox.postinst.in
  - add debian/firefox.preinst
  - update debian/rules
* Bump the firefox-3.0 conflict on firefox - this avoids an unnecessary
  conffile prompt for users upgrading from 3.6.6+nobinonly-0ubuntu0.8.04.1
  - update debian/control
* Clean up files left in /etc/firefox/profile by version
  3.6.6+nobinonly-0ubuntu0.8.04.1
  - update debian/firefox.preinst
* New major upstream release v3.6.6 (FIREFOX_3_6_6_RELEASE)
  - see USN-930-1
* Note that sun-java5-plugin has no support for Firefox 3.6. Users of
  sun-java5-plugin are advised to upgrade to sun-java6-plugin
* Switch to using unversioned binaries. This means that firefox and
  firefox-gnome-support are no longer meta-packages depending on the latest
  versioned binary packages, but they ship the binary components. Convert
  firefox-3.0* packages to meta packages which pull in the unversioned binaries
  to ensure a smooth upgrade path
  - update debian/control
  - rename debian/firefox-3.0-dev.install => debian/firefox-dev.install
  - rename debian/firefox-3.0-dev.links => debian/firefox-dev.links
  - rename debian/firefox-3.0-final.desktop => debian/firefox-final.desktop
  - rename debian/firefox-3.0-gnome-support.install => debian/firefox-gnome-support.install
  - rename debian/firefox-3.0-gnome-support.postinst.in => debian/firefox-gnome-support.postinst
  - rename debian/firefox-3.0-minefield.desktop => debian/firefox-minefield.desktop
  - rename debian/firefox-3.0-granparadiso.desktop => debian/firefox-namoroka.desktop
  - rename debian/firefox-3.0-restart-required.update-notifier => debian/firefox-restart-required.update-notifier
  - rename debian/firefox-3.0.dirs => debian/firefox.dirs
  - rename debian/firefox-3.0.install => debian/firefox.install
  - rename debian/firefox-3.0.links => debian/firefox.links
  - rename debian/firefox-3.0.menu => debian/firefox.menu
  - rename debian/firefox-3.0.postinst.in => debian/firefox.postinst.in
  - rename debian/firefox-3.0.prerm => debian/firefox.prerm.in
  - update Icon name in debian/firefox-final.desktop
  - update Icon, Exec and StartupWMClass fields in debian/firefox-minefield.desktop
  - update Name and Description in debian/firefox-restart-required.update-notifier
  - update debian/firefox.links to not create versioned link in /usr/bin
  - update fields in debian/firefox.menu
  - update debian/firefox.postinst.in
  - update debian/firefox.prerm.in
* Implement MIN_SYS_DEPS approach that does not use system xulrunner
  and only a minimal set of system dependencies.
  + drop patches not required anymore:
    - delete debian/patches/dont_depend_on_nspr_sources.patch
    - update debian/patches/series
  + move .install lines that depend on whether MIN_SYS_DEPS is used or not
    to debian/rules in ifneq (,$(MIN_SYS_DEPS)) blocks
    - update debian/rules
    - update debian/firefox.install
  + ship gnome support .so's inside of the main package, but keep dependencies in
    the (now empty) gnome-support package; to achieve this, we first install
    the gnome support files in the -gnome-support package and move them to the
    main package _after_ shlib depends where generated
    - update debian/rules
  + do not build-depend on xulrunner dev package anymore; local xulrunner builds
    with MIN_SYS_DEPS=0 should still work though
    - update debian/control
  + fix firefox.sh to handle all-static build
    - update debian/firefox.sh.in
* Fix LP: #398121 - firefox-3.5-gnome-support failed to install/upgrade; we
  make the postinst script more failsafe
  - update debian/firefox-gnome-support.postinst
* Add libstartup-notification0-dev to build-deps as it now seems to be
  mandatory on lpia
  - update debian/control
* Add libasound2-dev to Build-Depends for the new HTML5 <video> tag
  - update debian/control
* Add libiw-dev to build-depends to fix build failure
  - update debian/control
* Add libnotify-dev to build-depends
  - update debian/control
* adjust packaging to support localized searchplugins
  + ship default searchplugins in /usr/lib/firefox-addons/searchplugins/en-US/
    and link that directory to $(DEBIAN_FF3_DIR)/distribution/searchplugins instead
    of the main firefox APP_DIR
    - update debian/rules
  + set default searchplugin locale pref to en-US - which is used as a
    fallback if no matching searchplugins/LOCALE directory exists for the
    current locale directory
    - update debian/firefox.js
  + do not install upstream searchplugins through debhelper file and
    install "debsearch" to the new distribution/.../en-US location
    - update debian/firefox.install
  + ship "common" searchplugins link that points to the old default
    searchplugins location '/usr/lib/firefox-addons/searchplugins/
    - update debian/rules
    - update debian/firefox.links
  + rework localized search engine patch to use ChromeRegistry locale
    information rather than a char pref; also change plugin dir order to allow
    locale specific searchplugins to overlay the ones shipped in
    "searchplugins/common"
    - add debian/patches/bz515232_att399338_distro_locale_searchplugins.patch
    - update debian/patches/series
* Add patch for armv7 support
  - add debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
  - update debian/patches/series
* Fix LP: #428306 - default search engines are removed and readded (keywords
  wiped) with upgrade
  - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch
  - update debian/patches/series
* Fix LP: #423610 - daily build failures after landing of mozilla-nss.pc droppage
  (bug 422829); we drop our previously used nspr pkgconfig patch and fix
  configure.in to not require in-source nspr if libxul-sdk is used
  - delete debian/patches/nspr_flags_by_pkg_config_hack.patch
  - add debian/patches/bzXXX_libxul_sdk_nspr.patch
  - update debian/patches/series
* Add ability to set a preferred plugin for a given mime-type
  - add debian/patches/bzXXX_plugin_for_mimetype_pref.patch
  - update debian/patches/series
* Enable NetworkManager integration for proper offline detection
  - update debian/firefox.js
* Update profile migration tool for new version
  - update debian/migrator/main.c
* Move mozclient project files from mozilla-descripts to this package
  - add debian/mozclient/firefox-3.0.conf
  - add debian/mozclient/firefox-3.0.mk
  - add debian/moz-rev.sh
  - update debian/rules
* Fix LP: #520963 - sysprefs not honoured since firefox is built without
  system xulrunner; resurrect the patch we ship in xulrunner
  - add debian/patches/add_syspref_dir.patch
  - update debian/patches/series
* Drop patches applied upstream
  - remove debian/patches/bz436133_att322801.patch
  - debian/patches/installer_shouldnt_copy_xulrunner.patch
  - debian/patches/installer_use_stdout_for_missing_files.patch
  - update debian/patches/series
* Update / rebase patches
  - rename debian/patches/bzXXX_reload_new_plugins.patch =>
    debian/patches/bz460917_att350845_reload_new_plugins.patch
  - update debian/patches/lp185622_system_path_default_browser.patch
  - update debian/patches/ubuntu_no_app_updates.patch
* Add a cairo LCD filter to use Freetype LCD colour filtering features,
  based on the same patch applied to our system cairo package. Thanks to
  Marc Deslauriers for helping to make this work
  - add debian/patches/lp512615_cairo_lcd_filter.patch
  - update debian/patches/series
* Fix LP: #518422 - Firefox does not start with certain addons installed;
  don't normalize paths for xpti.dat
  - add debian/patches/lp518422.patch
  - update debian/series
* Fix LP: #548866 - forgets middlemouse.contentLoadURL on upgrade; add patch
  from xulrunner-1.9
  - update debian/patches/series
  - add debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
* Add support for using lockPref in preferences files
  - add debian/patches/bz467738_att351145_lockPref_everywhere.patch
  - update debian/patches/series
* Drop useless patch:
  - drop debian/patches/ftbfs-with-branding-dir
  - update debian/patches/series
* Build with --enable-ipc on amd64, i386 and armel. These are the only
  architectures where OOPP is supported. Build with --disable-ipc on all
  other architectures
  - update debian/rules
* Install the plugin-container binary for OOPP support when building
  with --enable-ipc
  - update debian/rules
* Fix LP: #443147 - Firefox on ARM inappropriately adds scroll bars to many
  frames and images; this is a workaround that forces -O2 for the whole
  mozilla tree build on armel; the scroll bar only manifests on lucid toolchain
  when using the upstream optimization flag mix
  - update debian/rules
* Fix FTBFS on sparc; disable jit on sparc until bmo 502369 is fixable
  - update debian/rules
* Update rosetta template name to firefox-3.6
  - update debian/translation-support/install.rdf.in
* Provide extra translations in desktop files
  - update debian/firefox-final.desktop
* Introduce alternative branding by splitting the official branding in to
  a firefox-branding package and providing abrowser and abrowser-branding.
  firefox depends on either of the branding packages, which conflict with each
  other
  - add debian/abrowser.desktop
  - update debian/control
  - update debian/rules
  - add debian/patches/abrowser_run_mozilla.patch
  - add debian/patches/awesome_browser_branding_install.patch
  - add debian/patches/browser_branding.patch
  - update debian/patches/series
* Add a ubuntu-abrowser.js file dedicated to abrowser and set useragent
  to Firefox/version
  - add debian/ubuntu-abrowser.js.tmpl
  - update debian/rules
* Don't provide firefox-*-dom-inspector and firefox-*-venkman transitional
  packages. We use an internal copy of xulrunner now, which no longer provides
  these extensions
  - update debian/control
* Create checksums for NSS libraries to make FIPS mode work
  - update debian/rules
* Ensure that startup notification works with the bundled xulrunner - build
  with --enable-startup-notification
  - update debian/rules
* Handle the system preferences moving location and beween packages during
  the upgrade - migrate the old settings to the new location if they have
  customisations already (and keep a backup of the new settings). Delete the
  old settings if they haven't been customised by the system administrator
  - add debian/firefox-3.0.preinst
  - update debian/firefox.postinst.in
* If the previous customised system configuration from 3.0 is retained
  during the upgrade, ensure that new preferenes defined in the stock 3.6
  configuration are added to the existing migrated configuration
  - update debian/firefox.postinst.in

219. By Nicolas Valcarcel on 2010-06-30

revert for re-merge

218. By Nicolas Valcarcel on 2010-06-29
217. By Nicolas Valcarcel on 2010-06-28

* New major upstream release v3.6.6 (FIREFOX_3_6_6_RELEASE)
  - see USN-930-1
* Note that sun-java5-plugin has no support for Firefox 3.6. Users of
  sun-java5-plugin are advised to upgrade to sun-java6-plugin
* Switch to using unversioned binaries. This means that firefox and
  firefox-gnome-support are no longer meta-packages depending on the latest
  versioned binary packages, but they ship the binary components. Convert
  firefox-3.0* packages to meta packages which pull in the unversioned binaries
  to ensure a smooth upgrade path
  - update debian/control
  - rename debian/firefox-3.0-dev.install => debian/firefox-dev.install
  - rename debian/firefox-3.0-dev.links => debian/firefox-dev.links
  - rename debian/firefox-3.0-final.desktop => debian/firefox-final.desktop
  - rename debian/firefox-3.0-gnome-support.install => debian/firefox-gnome-support.install
  - rename debian/firefox-3.0-gnome-support.postinst.in => debian/firefox-gnome-support.postinst
  - rename debian/firefox-3.0-minefield.desktop => debian/firefox-minefield.desktop
  - rename debian/firefox-3.0-granparadiso.desktop => debian/firefox-namoroka.desktop
  - rename debian/firefox-3.0-restart-required.update-notifier => debian/firefox-restart-required.update-notifier
  - rename debian/firefox-3.0.dirs => debian/firefox.dirs
  - rename debian/firefox-3.0.install => debian/firefox.install
  - rename debian/firefox-3.0.links => debian/firefox.links
  - rename debian/firefox-3.0.menu => debian/firefox.menu
  - rename debian/firefox-3.0.postinst.in => debian/firefox.postinst.in
  - rename debian/firefox-3.0.prerm => debian/firefox.prerm.in
  - update Icon name in debian/firefox-final.desktop
  - update Icon, Exec and StartupWMClass fields in debian/firefox-minefield.desktop
  - update Name and Description in debian/firefox-restart-required.update-notifier
  - update debian/firefox.links to not create versioned link in /usr/bin
  - update fields in debian/firefox.menu
  - update debian/firefox.postinst.in
  - update debian/firefox.prerm.in
* Implement MIN_SYS_DEPS approach that does not use system xulrunner
  and only a minimal set of system dependencies.
  + drop patches not required anymore:
    - delete debian/patches/dont_depend_on_nspr_sources.patch
    - update debian/patches/series
  + move .install lines that depend on whether MIN_SYS_DEPS is used or not
    to debian/rules in ifneq (,$(MIN_SYS_DEPS)) blocks
    - update debian/rules
    - update debian/firefox.install
  + ship gnome support .so's inside of the main package, but keep dependencies in
    the (now empty) gnome-support package; to achieve this, we first install
    the gnome support files in the -gnome-support package and move them to the
    main package _after_ shlib depends where generated
    - update debian/rules
  + do not build-depend on xulrunner dev package anymore; local xulrunner builds
    with MIN_SYS_DEPS=0 should still work though
    - update debian/control
  + fix firefox.sh to handle all-static build
    - update debian/firefox.sh.in
* Fix LP: #398121 - firefox-3.5-gnome-support failed to install/upgrade; we
  make the postinst script more failsafe
  - update debian/firefox-gnome-support.postinst
* Add libstartup-notification0-dev to build-deps as it now seems to be
  mandatory on lpia
  - update debian/control
* Add libasound2-dev to Build-Depends for the new HTML5 <video> tag
  - update debian/control
* Add libiw-dev to build-depends to fix build failure
  - update debian/control
* Add libnotify-dev to build-depends
  - update debian/control
* adjust packaging to support localized searchplugins
  + ship default searchplugins in /usr/lib/firefox-addons/searchplugins/en-US/
    and link that directory to $(DEBIAN_FF3_DIR)/distribution/searchplugins instead
    of the main firefox APP_DIR
    - update debian/rules
  + set default searchplugin locale pref to en-US - which is used as a
    fallback if no matching searchplugins/LOCALE directory exists for the
    current locale directory
    - update debian/firefox.js
  + do not install upstream searchplugins through debhelper file and
    install "debsearch" to the new distribution/.../en-US location
    - update debian/firefox.install
  + ship "common" searchplugins link that points to the old default
    searchplugins location '/usr/lib/firefox-addons/searchplugins/
    - update debian/rules
    - update debian/firefox.links
  + rework localized search engine patch to use ChromeRegistry locale
    information rather than a char pref; also change plugin dir order to allow
    locale specific searchplugins to overlay the ones shipped in
    "searchplugins/common"
    - add debian/patches/bz515232_att399338_distro_locale_searchplugins.patch
    - update debian/patches/series
* Add patch for armv7 support
  - add debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
  - update debian/patches/series
* Fix LP: #428306 - default search engines are removed and readded (keywords
  wiped) with upgrade
  - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch
  - update debian/patches/series
* Fix LP: #423610 - daily build failures after landing of mozilla-nss.pc droppage
  (bug 422829); we drop our previously used nspr pkgconfig patch and fix
  configure.in to not require in-source nspr if libxul-sdk is used
  - delete debian/patches/nspr_flags_by_pkg_config_hack.patch
  - add debian/patches/bzXXX_libxul_sdk_nspr.patch
  - update debian/patches/series
* Add ability to set a preferred plugin for a given mime-type
  - add debian/patches/bzXXX_plugin_for_mimetype_pref.patch
  - update debian/patches/series
* Enable NetworkManager integration for proper offline detection
  - update debian/firefox.js
* Update profile migration tool for new version
  - update debian/migrator/main.c
* Move mozclient project files from mozilla-descripts to this package
  - add debian/mozclient/firefox-3.0.conf
  - add debian/mozclient/firefox-3.0.mk
  - add debian/moz-rev.sh
  - update debian/rules
* Fix LP: #520963 - sysprefs not honoured since firefox is built without
  system xulrunner; resurrect the patch we ship in xulrunner
  - add debian/patches/add_syspref_dir.patch
  - update debian/patches/series
* Drop patches applied upstream
  - remove debian/patches/bz436133_att322801.patch
  - debian/patches/installer_shouldnt_copy_xulrunner.patch
  - debian/patches/installer_use_stdout_for_missing_files.patch
  - update debian/patches/series
* Update / rebase patches
  - rename debian/patches/bzXXX_reload_new_plugins.patch =>
    debian/patches/bz460917_att350845_reload_new_plugins.patch
  - update debian/patches/lp185622_system_path_default_browser.patch
  - update debian/patches/ubuntu_no_app_updates.patch
* Add a cairo LCD filter to use Freetype LCD colour filtering features,
  based on the same patch applied to our system cairo package. Thanks to
  Marc Deslauriers for helping to make this work
  - add debian/patches/lp512615_cairo_lcd_filter.patch
  - update debian/patches/series
* Fix LP: #518422 - Firefox does not start with certain addons installed;
  don't normalize paths for xpti.dat
  - add debian/patches/lp518422.patch
  - update debian/series
* Fix LP: #548866 - forgets middlemouse.contentLoadURL on upgrade; add patch
  from xulrunner-1.9
  - update debian/patches/series
  - add debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
* Add support for using lockPref in preferences files
  - add debian/patches/bz467738_att351145_lockPref_everywhere.patch
  - update debian/patches/series
* Drop useless patch:
  - drop debian/patches/ftbfs-with-branding-dir
  - update debian/patches/series
* Build with --enable-ipc on amd64, i386 and armel. These are the only
  architectures where OOPP is supported. Build with --disable-ipc on all
  other architectures
  - update debian/rules
* Install the plugin-container binary for OOPP support when building
  with --enable-ipc
  - update debian/rules
* Fix LP: #443147 - Firefox on ARM inappropriately adds scroll bars to many
  frames and images; this is a workaround that forces -O2 for the whole
  mozilla tree build on armel; the scroll bar only manifests on lucid toolchain
  when using the upstream optimization flag mix
  - update debian/rules
* Fix FTBFS on sparc; disable jit on sparc until bmo 502369 is fixable
  - update debian/rules
* Update rosetta template name to firefox-3.6
  - update debian/translation-support/install.rdf.in
* Provide extra translations in desktop files
  - update debian/firefox-final.desktop
* Introduce alternative branding by splitting the official branding in to
  a firefox-branding package and providing abrowser and abrowser-branding.
  firefox depends on either of the branding packages, which conflict with each
  other
  - add debian/abrowser.desktop
  - update debian/control
  - update debian/rules
  - add debian/patches/abrowser_run_mozilla.patch
  - add debian/patches/awesome_browser_branding_install.patch
  - add debian/patches/browser_branding.patch
  - update debian/patches/series
* Add a ubuntu-abrowser.js file dedicated to abrowser and set useragent
  to Firefox/version
  - add debian/ubuntu-abrowser.js.tmpl
  - update debian/rules
* Don't provide firefox-*-dom-inspector and firefox-*-venkman transitional
  packages. We use an internal copy of xulrunner now, which no longer provides
  these extensions
  - update debian/control
* Create checksums for NSS libraries to make FIPS mode work
  - update debian/rules
* Ensure that startup notification works with the bundled xulrunner - build
  with --enable-startup-notification
  - update debian/rules
* Handle the system preferences moving location and beween packages during
  the upgrade - migrate the old settings to the new location if they have
  customisations already (and keep a backup of the new settings). Delete the
  old settings if they haven't been customised by the system administrator
  - add debian/firefox-3.0.preinst
  - update debian/firefox.postinst.in
* If the previous customised system configuration from 3.0 is retained
  during the upgrade, ensure that new preferenes defined in the stock 3.6
  configuration are added to the existing migrated configuration
  - update debian/firefox.postinst.in
* Merge with debian-security. Remaining changes:
  - Added script for fixing default directory issues.
* Change name from "A Web Browser" to just "Web Browser"
* Remove firefox-branding dependency on firefox
* Dumped branding patch

216. By Nicolas Valcarcel on 2010-06-28

Remove firefox-branding dependency on firefox

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar RepositoryFormatKnitPack5 (bzr 1.6)
Stacked on:
lp:~mozillateam/firefox/firefox-3.7.head
This branch contains Public information 
Everyone can see this information.