lp://qastaging/ubuntu/lucid-security/firefox

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

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Mature

Recent revisions

86. By Chris Coulson

* New upstream stable release (FIREFOX_15_0_BUILD1)
  - see LP: #1041620 for USN information

* Add Acholi to the locale blacklist
* Separate the package name from the application name in various places.
  This enables us to change the package name without having to modify the
  application or packaging (eg, to allow us to provide official branded
  versions of Firefox ESR using the package name "firefox-esr")
  - update debian/README.Debian.in
  - update debian/apport/source_firefox.py.in
  - update debian/build/get-orig-source.mk
  - update debian/control{,.in}
  - update debian/control.langpacks
  - update debian/control.langpacks.unavail
  - update debian/firefox-locale.preinst.in
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.lintian-overrides.in
  - update debian/firefox.postinst.in
  - update debian/firefox.postrm.in
  - update debian/firefox.preinst.in
  - update debian/firefox.sh.in
  - remove debian/patches/change-moz-app-name.patch
  - update debian/patches/series
  - update debian/rules
  - update debian/usr.bin.firefox.apparmor.*
* Move parts of debian/rules that can be shared with Thunderbird to a
  new, common file (mozbuild.mk)
  - update debian/rules
  - add debian/build/mozbuild.mk
  - add debian/build/mozvars.mk
  - update debian/build/testsuite.mk
* Make it possible to use the same create-tarball.py for Firefox and
  Thunderbird
  - update debian/build/create-tarball.py
  - update debian/build/get-orig-source.mk
  - add debian/config/tarball.conf
* Switch to source format 3.0
  - add debian/source/format
  - add debian/source/options to diff-ignore the .mozclient.mk file which
    is created during clean, and to pass "--no-preparation"
  - update debian/build/enable-dist-patches.pl
  - rename debian/patches/series => debian/patches/series.in so the source
    isn't built with patches applied
  - update debian/README.source
* Goodbye embedded tarball, and our use of tarball.mk!
  - update debian/build/create-tarball.py
  - update debian/build/extract-file.py
  - update debian/build/get-orig-source.mk
  - update debian/build/mozbuild.mk
* Run the upstream cleansrcdir target during clean
  - update debian/build/mozbuild.mk
* Refresh patches
  - update debian/patches/mozilla-kde.patch
* Support the "parallel" option in DEB_BUILD_OPTIONS
  - update debian/build/mozbuild.mk
  - update debian/config/mozconfig.in
* Drop some of the complex shell script for creating language packs
  - update debian/build/mozbuild.mk
  - update debian/build/get-xpi-id.py
* Drop searchplugin patches - these patches are an absolute pain to maintain,
  as they seem to break frequently and we have to touch each localized
  plugin. Instead, just keep our own copy of plugins we modify, and add
  these in to the language packs at the end of the build process
  - remove debian/patches/ubuntu-codes-google.patch
  - remove debian/patches/ubuntu-codes-amazon.patch
  - remove debian/patches/ubuntu-codes-baidu.patch
  - update debian/patches/series.in
  - update debian/build/mozbuild.mk
  - add debian/searchplugins/*
* Get rid of pointless python script
  - remove debian/build/extract-file.py
  - update debian/build/mozbuild.mk
* Add an automated check for finding search engines that match particular
  patterns and verifying that they are replaced with our own search
  engine if we think they should be
  - add debian/build/check-search-overrides.pl
  - update debian/build/mozbuild.mk
  - add debian/searchplugins/overrides.json
  - update debian/control{,.in}
* Drop reload-new-plugins.patch, as this shouldn't actually be needed
  - remove debian/patches/reload-new-plugins.patch
  - update debian/patches/series.in
* Merge get-orig-source.mk in to mozbuild.mk
  - update debian/build/mozbuild.mk
  - remove debian/build/get-orig-source.mk
* Handle comments in locales.blacklist
  - update debian/build/refresh-supported-locales.pl
  - update debian/config/locales.blacklist
* Fork the upstream text preprocessor and add support for additional
  comparison operators, which means we no longer have to add new
  defines for every distro version specific change we add
  - add debian/build/Expression.py
  - add debian/build/Preprocessor.py
  - update debian/apport/source_firefox.py.in
  - update debian/build/mozbuild.mk
  - update debian/config/mozconfig.in
  - update debian/firefox-dev.install.in
  - update debian/firefox-locale.preinst.in
  - update debian/firefox.desktop.in
  - update debian/firefox.dirs.in
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.postinst.in
  - update debian/firefox.postrm.in
  - update debian/firefox.preinst.in
  - update debian/firefox.prerm.in
  - update debian/rules
* Refresh shipped locales
* Drop powerpc patches, which are fixed upstream
  - remove debian/patches/fix-dtoa-build-on-ppc.patch and
  - remove debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series.in
* Drop fix-crashreporter-ftbfs-with-gcc4.7.patch, which is fixed upstream

85. By Chris Coulson

* New upstream stable release (FIREFOX_14_0_1_BUILD1)
  - see LP: #1024562 for USN information

[ Chris Coulson <email address hidden> ]
* Refresh patches
  - update debian/patches/ubuntu-codes-google.patch
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/plugin-for-mimetype-pref.patch
  - update debian/patches/firefox-kde.patch
  - update debian/patches/add-syspref-dir.patch
* Drop patches fixed upstream
  - remove debian/patches/revert-bmo-621446-investigation.patch
  - update debian/patches/series
* Update desktop file translations
  - update debian/firefox.sh.in
* Drop the application/vnd.mozilla.xul+xml mimetype from the desktop file.
  Firefox hasn't been able to view XUL files from non-chrome URI's since
  version 4.0
  - update debian/firefox.desktop.in
* Add application/x-xpinstall to the MimeType field of the desktop file
  - update debian/firefox.desktop.in
* Drop the ability to select between tree/system libraries using a single
  option in debian/rules. It adds additional complexity and was never used
  - update debian/config/mozconfig.in
  - update debian/control.in
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
  - update debian/pkgconfig/libxul.pc.in
  - update debian/rules
* Fix make-makefile test failure when the build directory contains
  perl regexp control characters
  - add debian/patches/make-makefile-test-fix.patch
  - update debian/patches/series
* Shuffle the order of google-breakpad/src/common/dwarf/Makefile.in to fix a
  variable substitution issue, which was causing some objects to be built with
  the wrong compiler flags, resulting in dump_syms crashing (LP: #1002590)
  - add debian/patches/fix-makefile-substitution-bug.patch
* Update StartupWMClass to the correct name
  - update debian/firefox.desktop.in
  - update debian/rules
* Add search plugin for DuckDuckGo
* Fix LP: #1000820 - firefox-dev conflicts with xulrunner-1.9-dev for
  people with the latter still installed
  - update debian/control{,.in}
* Add Fulah to locales.blacklist
* Fix LP: #1013186 - install our vendor preferences as application
  defaults rather than GRE defaults, so that they are loaded after
  the upstream defaults again. The upstream defaults were also moved
  as part of the webapp runtime work (which has it's own application
  defaults)
  - update debian/firefox.install.in
* Apport hook improvements:
  - Sort preferences alphabetically in the apport data
  - Treat preferences set in default addons as default prefs so that
    they don't show up in apport data, unless the preference files have
    been modified
  - Support random pref files dropped in to the Firefox install folder, and
    preferences from application bundles
  - Fix ordering issues when loading preferences
* Drop debian/patches/plugin-for-mimetype-pref.patch. The burden of
  carrying this is starting to outweigh the benefits of it

[ Ben Collins <email address hidden> ]
* Cherry pick patch from aurora to use YARR interpreter on ppc
  - update debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series
* Fix ppc build due to new dtoa library
  - add debian/patches/fix-dtoa-build-on-ppc.patch
  - update debian/patches/series

84. By Micah Gersten

* New upstream stable release (FIREFOX_13_0_1_BUILD1)
  - see LP: #1013425 for USN information

83. By Chris Coulson

* New upstream stable release (FIREFOX_13_0_BUILD1)
  - see LP: #1007495 for USN information

[ Chris Coulson <email address hidden> ]
* Refresh build-depends:
  - Bump minimum GTK version to 2.14 as we build with GIO support
  - Add minimum requirement for glib (2.18)
  - Drop libidl-dev, this doesn't appear to be needed now
  - Bump minimum NSPR version to 4.9.0 for --enable-system-nspr builds
  - Bump minimum sqlite version to 3.7.10 for --enable-system-sqlite
    builds
  - Bump minimum NSS version to 3.13.2 for --enable-system-nss builds
* Refresh patches:
  - update debian/patches/ubuntu-ua-string-changes.patch
  - update debian/patches/ubuntu-codes-google.patch
  - update debian/patches/use-new-yasm-in-lucid.patch
  - update debian/patches/firefox-kde.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/dont-include-hyphenation-patterns.patch
* Clean up the file exclude list and add comments for excluded files
  - update debian/build/create-tarball.py
* Make it easy to run Firefox in valgrind for builds that are compiled
  with explicit valgrind support
  - update debian/firefox.sh.in
* Don't build with gnomevfs anymore
  - update debian/firefox-gnome-support.install.in
  - update debian/config/mozconfig.in
  - update debian/control.in
  - update debian/rules
* Bump debhelper compat to 7
  - update debian/apport/blacklist.in
  - update debian/apport/source_firefox.py.in
  - update debian/compat
  - update debian/config/mozconfig.in
  - update debian/control.in
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
  - update debian/firefox-gnome-support.install.in
  - update debian/firefox.dirs.in
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.postinst.in
  - update debian/firefox.preinst.in
  - update debian/firefox.sh.in
  - update debian/pkgconfig/libxul.pc.in
  - update debian/pkgconfig/mozilla-nspr.pc.in
  - update debian/pkgconfig/mozilla-plugin.pc.in
  - update debian/rules
  - update debian/usr.bin.firefox.apparmor.10.04
  - update debian/usr.bin.firefox.apparmor.9.10
* Override 2 embedded-library lintian errors
  - update debian/firefox.lintian-overrides.in
* Drop debian/patches/distro-locale-searchplugins after landing of
  bmo: #515232
* Don't hardcode general.useragent.locale to en-US, now that it's used
  for searchplugin localization. This means we can drop this pref from
  ubufox
  - add debian/patches/dont-override-general-useragent-locale.patch
  - update debian/patches/series
* Drop patches fixed upstream
  - remove debian/patches/no-sps-profiler-on-unsupported-archs.patch
  - remove debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch
  - update debian/patches/series
* Apport hook improvements:
  - Add support for reporting preference defaults that are set by extensions
  - When reporting preferences, record the source of each preference
  - Report plugin packages for plugins that are installed with the
    package manager
  - Add some addon manager related prefs to the whitelist
  - Display additional metadata in the extensions report
  - Take "default-to-compatible" in to account when determining whether
    the user is running incompatible addons
  - Attach submitted crash ID's to bug reports
  - Report if files in the profile folder have broken permissions
* Update compare-locales to 0.9.5
* Fix make-makefile test failure when the build directory contains
  perl regexp control characters
  - add debian/patches/make-makefile-test-fix.patch
  - update debian/patches/series
* Fix for NSS libs not being signed, breaking FIPS
  - update debian/rules

[ Jamie Strandboge <email address hidden> ]
* adjust apparmor profile to deny reads to @{PROC}/[0-9]*/net/dev. Patch
  thanks to James Troup (LP: #955066)
* adjust apparmor profile to deny reads to @{PROC}/[0-9]*/net/wireless.
  Patch thanks to James Troup (LP: #974141)

82. By Chris Coulson

* New upstream stable release (FIREFOX_12_0_BUILD1)
  - see LP: #987262 for USN information

[ Chris Coulson <email address hidden> ]
* Make sure to add a binary libgconf2-4 dependency as dpkg-shlibdeps won't
  do this for us now
  - update debian/rules
  - update debian/control{,.in}
* Firefox recommends libcanberra0 now that bmo: #635918 has landed
  - update debian/control{,in}
* Clean up search plugin installation now that we build our own
  language packs:
  - Drop the recursive symlink from /usr/lib/firefox-addons/searchplugins,
    which lintian kept complaining about
  - Don't effectively symlink distribution/searchplugins to searchplugins,
    as they have different layouts and this avoids the same data being
    iterated over twice
  - Revert to the upstream layout in distribution/searchplugins
    - add debian/firefox-locale.preinst.in, which will end up in all
      language packs to assist the symlink -> folder transition
    - update debian/firefox.dirs.in
    - update debian/firefox.install.in
    - update debian/firefox.links.in
    - update debian/firefox.preinst.in
    - update debian/patches/distro-locale-searchplugins.patch
    - update debian/rules
* Fix LP: #894166 - Make Firefox work with our system hyphenation patterns,
  and stop including our own
  - update debian/vendor.js
  - add debian/patches/dont-include-hyphenation-patterns.patch
  - update debian/patches/series
* Fix LP: #807733 - Firefox doesn't restart after upgrades where the version
  changes. Don't include the version number in the install path, as Firefox
  cannot re-exec itself.
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
  - update debian/firefox-locale.preinst.in
  - update debian/firefox.lintian-overrides.in
  - update debian/firefox.preinst.in
  - update debian/rules
* Expose distribution/extensions in /usr/lib/firefox-addons, to allow
  administrators to add extensions that they want to add to default user
  profiles, and that they want the addon manager to keep updated. We lost
  this functionality when upgrading from Firefox 3.6, due to the loss of
  /etc/firefox/profile
  - update debian/firefox.dirs.in
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.postinst.in
* Refresh patches
  - update debian/patches/firefox-kde.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/no-sps-profiler-on-unsupported-archs.patch
  - update debian/patches/ubuntu-codes-google.patch
  - update debian/patches/ubuntu-bookmarks.patch
  - update debian/patches/ubuntu-codes-amazon/patch
* Massively simplify distro-locale-searchplugins.patch, as we don't need
  to swap the loading order of common / locale-specific searchplugin
  paths. $LIBDIR/distribution/searchplugins/common is no longer a symlink
  to $LIBDIR/searchplugins, so there is no need to have the ability for
  locale-specific plugins to override common ones. They already override
  those in $LIBDIR/searchplugins
  - update debian/patches/distro-locale-searchplugins.patch
* Refresh locales
  - refresh debian/config/locales.all
  - refresh debian/control
* Make the language packs Architecture: any. Whilst they are actually
  architecture independent, we do install them in to /usr/lib (as the
  extensions location is shared with architecture-specific extensions).
  This also avoids the problem of offering incompatible language pack
  upgrades to users on architectures where Firefox fails to build
  (I'm looking at you, powerpc)
  - update debian/control.langpacks
  - update debian/control.langpacks.unavail
  - update debian/rules
  - refresh debian/control
* Disable fix-build-failure-without-yarr-jit.patch, as it needs some work.
  This means that there is currently no powerpc support

[ Jamie Strandboge <email address hidden> ]
* debian/usr.bin.firefox.apparmor.*:
  - allow access to statm and smaps for about:memory (LP: #911494)
  - allow read access to files in /opt (LP: #728485)

81. By Chris Coulson

* New upstream stable release (FIREFOX_11_0_BUILD1)
  - see LP: #951250 for USN information

* Rebuilt against updated gcc to fix LP: #931637
* Ensure that the crash reporter is disabled if rebuilt by Ubuntu
  derivatives, as there will be no crash symbols for those
  - update debian/rules
* Only add "Ubuntu" to the UA string when being built for Ubuntu
  - update debian/rules
* Temporarily disable ipdl tests due to build failures. These aren't
  enabled upstream, anyway
  - update debian/config/mozconfig.in
* Always set the update channel - not setting it at build-time on release
  builds breaks the extensions.checkCompatibility pref. The only things
  using it at runtime are nsBlocklistService, Test Pilot (beta + aurora)
  and the about dialog (where the channel is hidden anyway)
  - update debian/rules
  - update debian/firefox.install.in
* Fix LP: #898883 - IPC xpcshell tests hang the buildd's. Give all
  xpcshell tests an X display, as plugin-container won't work without one
  - update debian/build/testsuite.mk
* Turn on all IPC xpcshell tests again
  - update debian/build/testsute.mk
* Drop the default-apps xml file - there is already one provided by
  gnome-control-center, so ours duplicates this. We never used to install
  it for Firefox 3.6
  - remove debian/firefox.xml.in
  - update debian/firefox-gnome-support.install.in
  - update debian/rules
* Ship Test Pilot as a distribution addon, like upstream. This means
  that the addon manager can update it. It does also mean that it will
  remain installed in users profiles if they try the beta or aurora
  builds, but the Feedback button is disabled on release builds
  - update debian/firefox.install.in
  - fixes LP: #913357
* Drop patches fixed upstream
  - remove debian/patches/fix-cursor-handling.patch
  - update debian/patches/series
* Call xvfb-run with "-a" in case there are other servers running on the
  builder
  - update debian/build/testsuite.mk
* Really fix LP: #898883 - IPC xpcshell tests hang the build. What was
  actually happening is plugin-container would fail to start because all
  available X connections had been used up by many instances of dbus-launch,
  spawned each time an xpcshell tried to talk to the session bus. Because
  we run all of the xpcshell tests with one Xvfb instance, the buses
  accumulate until the available X connections all run out. To fix this, run
  all tests requiring a display inside dbus-launch, so we create just a
  single bus for all xpcshell tests
  - update debian/build/testsuite.mk
  - update debian/control{,.in}
* Add Ligurian to locale blacklist, as we don't support this in Ubuntu
  - update debian/config/locales.blacklist
* Fix LP: #918763 - Revert the temporary investigation patch for
  bmo: #621446, as it breaks GCC4.4
  - add debian/patches/revert-bmo621446-investigation.patch
  - update debian/patches/series
* Refresh patches
  - update debian/patches/ubuntu-ua-string-changes.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/firefox-kde.patch
* Fix LP: #915895 - Just set autoDisableScopes to 0. Other distributions
  are already doing this, and we already made this feature pretty much
  useless by allowing extensions in the application directory, so that our
  language packs aren't disabled by default
  - update debian/vendor.js
* Drop the solid white separators from the addressbar autocomplete dropdown,
  and increase padding so that it doesn't look so bad with dark themes
  - add debian/patches/autocomplete-theme-tweak.patch
  - update debian/patches/series
* Fix LP: #926495 - Add patch based on one from bmo: #691898 to enable
  building on ppc again
  - add debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series
* Fix LP: #926495 - Disable the SPS profiler on unsupported architectures
  - add debian/patches/no-sps-profiler-on-unsupported-archs.patch
  - update debian/patches/series
* Add a missing include in gfx/angle/src/compiler/Types.h (backported
  from Aurora)
  - add debian/patches/fix-missing-stl-include-in-angle.patch
  - update debian/patches/series

80. By Micah Gersten

* New upstream stable release (FIREFOX_10_0_2_BUILD1)
  - see LP: #933293 for USN information

79. By Micah Gersten

* New upstream stable release (FIREFOX_10_0_1_BUILD1)
  - see LP: #929833 for USN information

* fix LP: #926347 - Fix apparmor denial on Lucid
  - update debian/usr.bin.firefox.apparmor.10.04

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
  gracefully
  - 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}

Branch metadata

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

Subscribers