Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/lucid-proposed/firefox
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

78. By Chris Coulson

* New upstream stable release (FIREFOX_10_0_BUILD1)
  - see LP: #923319 for USN information

[ Chris Coulson <email address hidden> ]
* Update patches for PRBool -> bool transition
  - refresh debian/patches/firefox-kde.patch
  - refresh debian/patches/mozilla-kde.patch
  - refresh debian/patches/ubuntu-ua-string-changes.patch
* Drop some more hanging IPC xpcshell tests
  - update debian/build/testsuite.mk
* Remove prerm hook for cleaning up pyc files in the apport package-hooks
  folder. Nothing creates these
  - update debian/firefox.prerm.in
* Set up alternatives in the postinst script on abort-remove too
  - update debian/firefox.postinst.in
* Imporove maintainer script magic for removing obsolete conffiles when
  upgrading from 3.6, by doing what dpkg-maintscripts-helper does
  - update debian/firefox.postinst.in
  - update debian/firefox.postrm.in
  - update debian/firefox.preinst.in
* Only run the Apparmor stuff in the postinst script on configure, and
  in the preinst script on install or upgrade, so it handles upgrade failures
  - update debian/firefox.postinst.in
  - update debian/firefox.preinst.in
* Drop the Ubuntuzilla workarounds now
  - update debian/firefox.postinst.in
* Refresh patches
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/ubuntu_bookmarks.patch
* Turn off Network Manager integration for now, as it causes Firefox to
  always start in offline mode. In any case, probing Network Manager isn't
  the most reliable way to test if there is a connection
  - update debian/vendor.js
* Update after landing of bmo: #701875 - Rename omni.jar to omni.ja
  - update debian/firefox.install.in
* Disable the tests on powerpc, because it sucks too much to run them
  - update debian/rules
* "Fix" LP: #897794 - some websites expect "X11" to be the first token of
  the platform component in the UA string
  - update debian/patches/ubuntu-ua-string-changes.patch
* Defuzz ubuntu-codes-google.patch
* Refresh shipped locales (adds Assamese and Kashubian)
  - refresh debian/config/locales.shipped
  - refresh debian/control
* Update KDE patches for removal of nsCStringArray
  - update debian/firefox-kde.patch
  - update debian/mozilla-kde.patch
* Backport changes to allow per-release/per-arch patches
  - add debian/build/enable-dist-patches.pl
  - update debian/rules
* Fix LP: #908508 - Add patch from upstream to fix powerpc build failure.
  Only apply this patch on powerpc to avoid compromising the quality of
  the architectures that we care about
  - add debian/patches/fix-build-failure-without-yarr-jit2.patch
  - update debian/patches/series
* Also make the previous powerpc build fix apply on ppc only
  - update debian/patches/series
* Fix LP: #923461 - Broken Apparmor profile with Firefox 9.0.1
  - update debian/usr.bin.firefox.apparmor.10.04

[ Micah Gersten <email address hidden> ]
* Rebase patches for PRBool -> bool transition (bmo: 675553)
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/mozilla-kde.patch
* Drop patch after upstream landing of (bmo: 690432) aka Logging.h passes a
  string directly to printf
  - drop debian/patches/printf-fix.patch
  - update debian/patches/series

[ Adam Conrad <email address hidden> ]
* Add missing build-dep on non-essential locales, since we use it.
  - update debian/control{,.in}

77. By Micah Gersten

[ Chris Coulson <email address hidden> ]
* Fix LP: #907666 - readd missing kubuntu-firefox-installer Replaces
  - update debian/control

[ Micah Gersten <email address hidden> ]
* Fix LP: #917529 - Make sure new transitional packages have a versioned
  dependency on Firefox so as to not break Firefox during partial upgrades
  - update debian/control{,.in}

76. By Micah Gersten

New upstream stable release (FIREFOX_9_0_1_BUILD1) (LP: #904594)

75. By Chris Coulson

* New upstream stable release (FIREFOX_9_0_BUILD1)

[ Chris Coulson <email address hidden> ]
* Install the Apport hook as a source package hook
  - rename debian/apport/firefox.py.in => debian/apport/source_firefox.py.in
  - update debian/firefox.install.in
  - update debian/rules
* Don't unconditionally overwrite SourcePackage when reporting bugs with
  the nightly apport hook
  - update debian/apport/source_firefox.py.in
* Set "Channel = Unavailable" if channel-prefs.js doesn't contain a
  channel name
  - update debian/apport/source_firefox.py.in
* Ensure that create-tarball can handle there not being a locale blacklist
  - update debian/build/create-tarball.py
* Drop xpt.py and xpidl from $LIBDIR. xpidl is gone, and xpt.py isn't included
  there in the upstream SDK
  - update debian/firefox-dev.links.in
* Fix LP: #901838 - Ugly busy pointer, due to libxcursor no longer matching
  the cursor bitmap to a nice themed pointer
  - add debian/patches/fix-cursor-handling.patch
  - update debian/patches/series
* Don't disable our bundled addons on upgrade
  - update debian/vendor.js
* Modify the UA string to add "Ubuntu" to the platform component
  - add debian/patches/ubuntu-ua-string-changes.patch
  - update debian/patches/series
  - update debian/rules
* Move custom scripts to debian/build
  - move debian/get-xpi-id.py to debian/build/get-xpi-id.py
  - move debian/refresh-supported-locales.pl to
  - move debian/extract-file.py to debian/build/extract-file.py
  - update debian/rules
  - move debian/testsuite.mk to debian/build/testsuite.mk
* Dropped patches that are obsolete or fixed upstream:
  - remove debian/patches/lp512615_cairo_lcd_filter.patch
  - remove debian/patches/lp185622_system_path_default_browser.patch
  - remove debian/patches/bz386904_config_rules_install_dist_files.patch
  - remove debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
  - remove debian/patches/bzXXX_libxul_sdk_nspr.patch
  - remove debian/patches/drop_bz418016.patch
  - remove debian/patches/firefox-fsh
  - remove debian/patches/firefox-profilename
  - remove debian/patches/ubuntu_no_app_updates.patch
  - update debian/patches/series
* Refresh patches:
  - update debian/patches/firefox-kde.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/ubuntu-codes-google.patch
  - update debian/patches/reload-new-plugins.patch
  - update debian/patches/plugin-for-mimetype-pref.patch
  - update debian/patches/add-syspref-dir.patch
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/distro-locale-searchplugins.patch
  - update debian/patches/ubuntu-bookmarks.patch
* Shrink the default mozconfig right down so that we use mostly upstream
  defaults, rather than overriding them with our own options. It is still
  possible to override them though. We also drop the pkg-config checks in
  debian/rules which allowed a fallback build configuration when dependencies
  aren't satisfied. Really, the build should just fail here rather than
  continuing in some undesirable fallback mode
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
  - update debian/mozconfig.in
  - update debian/pkgconfig/libxul.pc.in
  - update debian/control.in
  - update debian/rules
* Refresh build-depends, as this hasn't been done for a while:
  - Drop patchutils, libxft-dev, libxinerama-dev, libgnome2-dev and bzip2.
    These aren't needed
  - Drop liborbit2-dev - only required if there is no libidl
  - Add libglib2.0-dev, libext-dev, libfontconfig1-dev and libpango1.0-dev,
    as the configure script checks for these directly
  - Add minimum versions to libgconf2-dev, libgnomevfs2-dev, yasm and
  - Specify minimum versions for libnspr4-dev, libcairo2-dev, libsqlite3-dev
    and libnss3-dev when using system versions of those libs
* Introduce a branch config file (debian/config/branch.mk) which holds
  settings which shouldn't be merged between branches (eg, whether
  the crash reporter should be enabled)
  - add debian/config/branch.mk
  - update debian/rules
* Move debian/locales.* to debian/config
  - move debian/locales.shipped => debian/config/locales.shipped
  - move debian/locales.unavail => debian/config/locales.unavail
  - move debian/locales.blacklist => debian/config/locales.blacklist
  - update debian/rules
  - update debian/build/refresh-supported-locales.pl
* Don't open about:blank from the New Window quicklist entry
  - update debian/firefox.desktop.in
* Touch debian/control.in during clean to force a refresh of debian/control,
  so we can check if it is out-of-date and fail if it is
  - update debian/rules
* Drop the mozilla-devscripts dependency. We were only using this for creating
  tarballs anyway. Instead, implement our own get-orig-source target, which
  also fixes some problems we were having
  - update debian/control.in
  - remove debian/moz-rev.sh
  - update debian/rules
  - remove debian/mozclient/firefox.mk
  - remove debian/mozclient/firefox.conf
  - update debian/config/branch.mk
  - add debian/build/create-source
  - add debian/build/get-orig-source.mk
* Lots of workflow improvements for dealing with language packs:
  - update debian/rules
  - add debian/build/extract-file.py
  - add debian/build/dump-langpack-control-entries.pl
  - update debian/build/refresh-supported-locales.pl
  - add debian/config/locales.all
  - update debian/config/locales.shipped
  - remove debian/config/locales.unavailable
  - update debian/control
  - update debian/build/create-tarball.py
* Turn off the one-time addon selection dialog (LP: #888307)
  - update debian/vendor.js
* Add Mongolian and Swahili to locale blacklist. These aren't meant to be
  built on the release channel, but they still appear in the upstream
  - update debian/locales.blacklist
* Rewrite the apport hook to be more useful
  - update debian/apport/firefox.py.in
* Ship a file in /etc/apport/native-origins.d to enable bug reporting
  on PPA branches
  - add debian/apport/native-origins.in
  - rename debian/apport/firefox.in => debian/apport/blacklist.in
  - update debian/rules
  - update debian/firefox.install.in
  - update debian/firefox.dirs.in
* Update the apport blacklist file now that the binary name has changed
  - update debian/apport/firefox.in
* Look in the correct location for the staged langpack xpi's. They moved
  from dist/install to dist/linux-$(DEB_HOST_GNU_CPU)
  - update debian/rules
* Simplify firefox-dev.install a bit by installing everything in
  - update debian/firefox-dev.install.in
* Handle video/webm mimetypes
  - update debian/firefox.desktop.in
* Fix check-sync-dirs.py test failure - ensure config/system-headers and
  js/src/config/system-headers are kept in sync
  - update debian/patches/unity-globalmenu-build-support-patch
* Fix browserGlue_distribution.js and browserGlue_smartBookmarks.js xpcshell
  test failures. Update DEFAULT_BOOKMARKS_ON_MENU with the correct number of
  default bookmarks
  - update debian/patches/ubuntu-bookmarks.patch
* Fix jsreftest failures by setting the correct timezone and locale
  - update debian/testsuite.mk
* Switch off debian/patches/fix-selection-drag-autoscroll.patch for now. It
  doesn't apply and needs a rethink
  - update debian/patches/series
* Fix "format not a string literal and no format arguments" error
 - add debian/patches/printf-fix.patch
 - update debian/patches/series
* Update for the binary name change
  - update debian/firefox.install.in
  - update debian/firefox.sh.in
* Ensure we install dependentlibs.list so that Firefox knows which libs
  to dlopen before libxul
  - update debian/firefox.install.in
* Get rid of some more hanging IPC xpcshell tests
  - update debian/testsuite.mk
* Now Firefox lazy loads libxul, drop the LD_LIBRARY_PATH hack from the
  shell wrapper (LP: #561124)
  - update debian/firefox.sh.in
* Only install channel-prefs.js on aurora/beta, where we need it for
  Test Pilot. We don't set a channel name on other branches anyway, so we
  just end up with a nonsense channel name ("default") appearing in the
  About dialog
  - update debian/rules
  - update debian/firefox.install.in
  - update debian/apport/firefox.py.in
* Don't error out whilst creating the source package if mozilla-devscripts
  or cdbs aren't installed. This enables us to create source packages
  on machines which don't have these available
  - update debian/rules
  - update debian/mozclient/firefox.mk
* Unconditionally build with --disable-elf-hack. It's basically a noop
  on Ubuntu, as we don't get any of the nice space saving and startup
  time improvements that upstream builds get with it. Enabling it is
  problematic (it fails to build on all architectures in Ubuntu from
  Firefox 7 onwards, and is problematic on armel when building on
  older Ubuntu versions)
  - update debian/rules
  - update debian/mozconfig.in
* Don't unconditionally set -fshort-wchar in the libxul.pc pkgconfig file.
  It's no longer needed with newer toolchains which support gnu++0x, and
  defining it breaks the mozvoikko build
  - update debian/pkgconfig/libxul.pc.in
  - update debian/rules
* Drop the profile migrator, as it doesn't really make any sense with the new
  release cycle. In Firefox 7, we want to drop the shell wrapper script
  - remove debian/migrator/xulapp-profilemigrator
  - update debian/firefox.sh.in
  - update debian/firefox.install.in
  - update debian/rules
  - update debian/control.in
* xpt_link and xpt_dump have been replaced by xpt.py
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
* Add support for the system provided hyphenation patterns, by linking
  @MOZ_LIBDIR@/hyphenation to /usr/share/hyphen
  - update debian/firefox.links.in
* Drop the special "kde.js" file handling from the pref service. It hasn't
  had the desired effect since Firefox 4, as the specialfile handling
  doesn't apply to pref files inside the omni.jar. Moving kde.js back in to
  defaults/pref isn't an option, as these are always read after the prefs
  in the omni.jar, which would mean that all users would get the KDE
  specific prefs. Note, we only override one pref in kde.js anyway, it can
  go elsewhere if really required
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/firefox-kde.patch
  - note, this doesn't change any behaviour from Firefox 4 and 5, but the
    code this patch touched was rewritten in Firefox 6, so it makes more
    sense to just remove it now rather than refactor it and it stil not work
* Drop abrowser. The abrowser branding doesn't work since Firefox 4, and
  is going to be difficult to maintain going forwards. The Firefox logo
  is freely licensed now, which was the main reason for the existance of
  abrowser. Current abrowser users will be migrated to Firefox
  - remove debian/abrowser.desktop
  - update debian/control
  - update debian/rules
  - remove debian/ubuntu-abrowser.js.tmpl
  - remove debian/patches/awesome_browser_branding_install.patch
  - update debian/patches/series
  - remove debian/patches/browser_branding.patch
  - remove debian/patches/abrowser_run_mozilla.patch
* Auto-generate debhelper and other files at build-time
  - rename debian/firefox.dirs => debian/firefox.dirs.in
  - rename debian/firefox.install => debian/firefox.install.in
  - rename debian/firefox.links => debian/firefox.links.in
  - rename debian/firefox.menu => debian/firefox.menu.in
  - rename debian/firefox.xml => debian/firefox.xml.in
  - rename debian/firefox-gnome-support.install =>
  - rename debian/apport/firefox.py => debian/apport/firefox.py.in
  - rename debian/firefox-restart-required.update-notifier =>
  - add debian/firefox-mozsymbols.in
  - update debian/firefox.dirs.in
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.menu.in
  - update debian/firefox-gnome-support.install.in
  - update debian/apport/firefox.py.in
  - update debian/firefox-restart-required.update-notifier.in
* Update apport hook to work with packed extensions
  - update debian/apport/firefox.py.in
* Drop firefox-gnome-support maintainer scripts, as they aren't needed
  now. Touching .autoreg on install doesn't do anything, and registering
  the gnome-www-browser alternative has moved to firefox
  - remove debian/firefox-gnome-support.postinst.in
  - remove debian/firefox-gnome-support.prerm.in
  - update debian/firefox.postinst.in
  - update debian/firefox.prerm.in
* Tidy up the branding selection to auto-select based on the channel.
  Also drop obsolete desktop files
  - update debian/rules
  - remove debian/firefox-minefield.desktop
  - remove debian/firefox-namoroka.desktop
* Build language packs directly from the firefox source
  + Fixes LP: #294187 - Firefox Locales should install locale specific
    search plugins
  + Rip out the bits to create a en-US.xpi
    - update debian/rules
    - remove debian/translation-support/install.rdf.in
  + Include compare-locales FIREFOX_5_0b1_BUILD1 from
    http://hg.mozilla.org/build/compare-locales. It's needed for merging
    en-US strings with incomplete locales
  + Pull l10n data in to tarball from bzr
    - update debian/mozclient/firefox.conf
  + Configure build for creating language packs by configuring with
    - update debian/mozconfig.in
  + Store the list of locales to ship, and provide a way of automatically
    generating that list and the control file entries from the upstream
    source. Also provide a way to blacklist languages. We map languages
    to package names using langpack-o-matic (and also get descriptions
    from there too)
    - update debian/rules
    - add debian/locales.shipped
    - add debian/control.langpacks
    - update debian/control.in
    - add debian/locale.blacklist
    - add debian/refresh-supported-locales.pl
  + Add common-build-indep hook to build the translation xpi's
    - update debian/rules
  + Add common-binary-post-install-indep to install the xpi's and
    searchplugins in to the correct debian packages
    - update debian/rules
    - add debian/get-xpi-id.py
  + When rebuilding debian/control in the clean target, fail the build
    if the control file was out-of-date. This ensures that we don't
    accidentally drop language packs, and forces me to maintain an
    up-to-date control file in bzr
    - update debian/rules
  + Apply vendor patches to localized searchplugins too
    - update debian/patches/ubuntu-codes-amazon.patch
    - add debian/patches/ubuntu-codes-baidu.patch
    - update debian/patches/ubuntu-codes-google.patch
  + Add languages that are currently dropped in FF5 (compared with FF3.6) to
    locales.unavailable. Having transitional packages now will make
    transitioning easier later on if they come back
    - add debian/locales.unavailable
* Build with "make -f client.mk" and using a mozconfig, rather than the
  autoconf/configure/make steps used previously. The client.mk contains the
  sequencing for doing PGO builds
  - add debian/mozconfig.in
  - update debian/rules
* Prevent LP: #643899 - Firefox sending header "Accept-Language:
  chrome://global/locale/intl.properties" because the intl.accept_languages
  preference is messed up. Drop a patch which causes the preferences
  system to save a user preference when changing a preference value to equal
  the system default value (and revert to the original behaviour where the
  preference is just discarded). This should hopefully stop Firefox Sync
  from breaking localized preferences where they haven't been modified by
  the user, but does regress LP: #548866
  - update debian/patches/series
* Prevent LP: #744580 - Firefox doesn't autoscroll when selecting content
  - add debian/patches/fix-selection-drag-autoscroll.patch
  - update debian/patches/series
* Run the Mozilla test suite at build time. Test-suite failures won't
  break the build just yet
  - add debian/testsuite.mk
  - update debian/rules
  - update debian/control.in
* Build using the versioned yasm-1 binary backported to Lucid
  - add debian/patches/use-new-yasm-in-lucid.patch
  - update debian/patches/series
  - update debian/control.in
  - refresh debian/control
* Add a firefox-dev package. We need this for mozvoikko
  - update debian/control.in
  - add debian/firefox-dev.install.in
  - add debian/firefox-dev.links.in
  - add debian/pkgconfig/libxul.pc.in
  - add debian/pkgconfig/mozilla-nspr.pc.in
  - add debian/pkgconfig/mozilla-plugin.pc.in
  - update debian/rules
  - refresh debian/control
  - update debian/patches/series

[ Brian Murray <email address hidden> ]
* Fix LP: #758111 - update ubuntulinux.org bookmark - thanks to Jonathan
  Rothwell for the patch

[ Micah Gersten <email address hidden> ]
* Add patch from upstream to fix PowerPC FTBFS (bmo: 703534) aka
  Build failure on platforms without YARR JIT
  - add debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series

74. By Micah Gersten

* New upstream release v3.6.24 (FIREFOX_3_6_24_BUILD2)
  - see USN-1251-1

73. By Micah Gersten

* New upstream release v3.6.23 (FIREFOX_3_6_23_BUILD1)
  - see USN-1210-1

72. By Micah Gersten

* New upstream release v3.6.22 (FIREFOX_3_6_22_BUILD2)
  - Distrust and disable all DigiNotar certs including the Staat der
    Nederlanden Certificates (LP: #838322)

71. By Micah Gersten

* New upstream release v3.6.21 (FIREFOX_3_6_21_BUILD1)
  - Distrust and disable DigiNotar Root CA due to fraudulent certificate
    issuance (LP: #837557)

70. By Micah Gersten

* New upstream release v3.6.20 (FIREFOX_3_6_20_BUILD1)
  - see USN-1184-1

* Drop patch for previous cookie regression, accepted upstream
  - drop debian/patches/lp801778_bz667087_att542125-fix-cookie-regression.patch
  - update debian/patches/series

69. By Micah Gersten

* fix LP: #801778 - Regression: Firefox 3.6.18 does not set cookie when
  talking to single letter hostname
  - add debian/patches/lp801778_bz667087_att542125-fix-cookie-regression.patch
  - update debian/patches/series

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.