Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/natty-updates/thunderbird
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

80. By Chris Coulson

* New upstream stable release (THUNDERBIRD_14_0_BUILD1)
  - see LP: #1024564 for USN information

[ Chris Coulson <email address hidden> ]
* Update globalmenu-extension to 3.2.5
  - Fix a crash in uGlobalMenu::RecycleList::~RecycleList()
  - Fix LP: #1010580 - update the window event timestamp when handling
    menu events
* Drop patches fixed upstream
  - remove debian/patches/revert-bmo621446-investigation.patch
  - update debian/patches/series
* Refresh patches
  - update debian/patches/add-syspref-dir.patch
* Update desktop file translations
  - update debian/thunderbird.desktop.in
* Add application/x-xpinstall to the MimeType field of the desktop file
  - update debian/thunderbird.desktop.in
* Drop almost all mimetypes from the desktop file. Thunderbird won't display
  any of them if you invoke it with files of these types. It will just
  open a Compose window and add the file as an attachment
  - update debian/thunderbird.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/thunderbird-dev.links.in
  - update debian/rules
* 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
* Don't set LD_LIBRARY_PATH in our shell wrapper, and install
  dependentlibs.list instead now
  - update debian/thunderbird.sh.in
  - update debian/thunderbird.install.in
* Drop StartupWMClass from the desktop file now that WM_CLASS is the same
  as the binary name (also fixes LP: #1012158)
  - update debian/thunderbird.desktop.in
  - update debian/rules
* 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 Thunderbird install folder,
    and preferences from application bundles
  - Fix ordering issues when loading preferences
* Update the Apport blacklist file after dropping thunderbird-bin
  - update debian/apport/blacklist.in

[ 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

79. By Chris Coulson

* New upstream stable release (THUNDERBIRD_13_0_1_BUILD1)
  - see LP: #1007556 for USN information

* Update globalmenu-extension to v3.2.3
  - Reduce our memory footprint a bit, which wasn't really a lot anyway
  - Avoid the use of the component manager for accessing commonly used
    services, where "commonly used" means "accessed when building every
    menu item". This should save some CPU cycles when building or
    refreshing menus
  - Try to recycle menuitems when they are removed from a menu by
    adding contiguous blocks of removed items to a "free list" which
    is emptied asynchronously, and reusing the items in this list when
    new items are added in place of the removed items. This means that
    menus which fully refresh on opening no longer alter the menu
    structure, but instead just update properties on existing nodes.
    This has a few benefits:
    + With no layout changes, unity-panel-service doesn't request
      the entire menu structure, which significantly reduces dbus traffic
      and makes it much faster to refresh the menu contents
    + The size of the menu doesn't change when it is refreshed, which
      eliminates the flicker that used to occur when opening some menus
  - Remove all use of the global observer service for sending our own
    internal notifications around
  - Get rid of a static initializer
  - Don't support older than Thunderbird 11
  - Fix some GError leaks
  - Hide the internal menu when creating a native menu, rather than
    waiting for confirmation that the native menu is registered
    successfully. We don't try to create a native menu if we don't
    find a menu service to register the menu with anyway
  - Keep menu contents updated whilst the menu is open, rather than
    just whilst it is opening
  - Fix LP: #915888 - Formatting toolbar menu entry is inverted
* 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
  - Bump minimum NSS version to 3.13.2 for --enable-system-nss builds
* Clean up the file exclude list and add comments for excluded files
  - update debian/build/create-tarball.py
* Make it easy to run Thunderbird in valgrind for builds that are compiled
  with explicit valgrind support
  - update debian/thunderbird.sh.in
* Refresh patches:
  - update debian/patches/revert-bmo621446-investigation.patch
  - update debian/patches/dont-include-hyphenation-patterns.patch
* Drop patches fixed upstream:
  - remove debian/patches/use-menubar-text-colour-on-tabbar.patch
  - remove debian/patches/no-sps-profiler-on-unsupported-archs.patch
  - remove debian/patches/distro-locale-searchplugins.patch
  - remove debian/patches/avoid-dbus-roundtrip-for-httpchannel.patch
  - update debian/patches/series
* Bump debhelper compat to 7
  - update debian/apport/blacklist.in
  - update debian/appoty/source_thunderbird.py.in
  - update debian/compat
  - update debian/config/mozconfig.in
  - update debian/control.in
  - update debian/rules
  - update debian/thunderbird-dev.install.in
  - update debian/thunderbird-dev.links.in
  - update debian/thunderbird-globalmenu.dirs.in
  - update debian/thunderbird-gnome-support.install.in
  - update debian/thunderbird.dirs.in
  - update debian/thunderbird.install.in
  - update debian/thunderbird.links.in
  - update debian/thunderbird.lintian-overrides.in
  - update debian/thunderbird.sh.in
* Use "general.useragent.locale" to select the searchengine locale
  - update debian/patches/distro-locale-searchplugins.patch
  - add debian/patches/dont-override-general-useragent-locale.patch
  - update debian/patches/series
* Drop no-dynamic-nss-softokn.patch. This patch has no documentation and
  it doesn't look like it's actually useful for anything
* 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 for NSS libs not being signed, breaking FIPS
  - update debian/rules
* Update StartupWMClass to the correct name
  - update debian/thunderbird.desktop.in
  - update debian/rules

78. By Chris Coulson

* New upstream stable release (THUNDERBIRD_12_0_1_BUILD1)
  - see LP: #987305 for USN information

* Update globalmenu-extension to 2.0.6
* Call xvfb-run with "-a" in case there are other servers running on the
  - update debian/build/testsuite.mk
* 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}
* Thunderbird recommends libcanberra0 now that bmo: #635918 has landed
  (LP: #732572)
  - update debian/control{,in}
* Refresh patches
  - update debian/patches/no-sps-profiler-on-unsupported-archs.patch
* Drop patches fixed upstream
  - remove debian/patches/ctypes-callback-reentry-fix.patch
  - update debian/patches/series
* Drop the version number from the install path, like we've done for Firefox
  - update debian/rules
  - update debian/thunderbird-dev.install.in
  - update debian/thunderbird-dev.links.in
  - update debian/thunderbird.dirs.in
  - update debian/thunderbird.links.in
  - update debian/thunderbird.lintian-overrides.in
* Fix LP: #939652 - Web search functionality is broken in Ubuntu builds.
  Ship the localized Opensearch plugins in distribution/searchplugins.
  Also add a patch to use the locale of the global chrome package to
  select the search locale, like we do with Firefox. Add another patch
  to fix various bugs in webSearchProvider.js (see bmo: #733802)
  - add debian/patches/distro-locale-searchplugins.patch
  - update debian/rules
  - update debian/thunderbird.dirs.in
  - update debian/thunderbird.install.in
  - update debian/thunderbird.links.in
  - update debian/vendor.js
* Fix LP: #894166 - Make Thunderbird 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: #925907 - 12.04 Thunderbird colour theme is unreadable. Use
  -moz-menubartext rather than MenuText for elements with menubar styled
  backgrounds. Should also fix LP: #856939
  - add debian/patches/use-menubar-text-colour-on-tabbar.patch
  - update debian/patches/series
* 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 Thunderbird 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

77. By Chris Coulson

* New upstream stable release (THUNDERBIRD_11_0_1_BUILD1)

* Update globalmenu-extension to 2.0.3
* Ensure we include locales in the tarball if they are in shipped-locales
  but not in all-locales
  - update debian/build/create-tarball.py
* 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/thunderbird.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 (only applicable when the testsuite
  is enabled in the future)
  - update debian/build/testsute.mk
* Refresh shipped locales for beta (addition of Armenian and Croatian)
  - refresh debian/config/locales.shipped
  - refresh debian/config/locales.all
  - refresh debian/control
* 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
* 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
* Disable more hanging IPC xpcshell tests
  - update debian/build/testsuite.mk
* Drop the maintainer script hooks to remove conffiles that never even existed
  - remove debian/thunderbird.preinst.in
  - update debian/rules
* Update after landing of bmo: #701875 - Rename omni.jar to omni.ja
  - update debian/thunderbird.install.in
* Backport changes to allow per-release/par-arch patches
  - add debian/build/enable-dist-patches.pl
  - update debian/rules
* Don't unconditionally overwrite SourcePackage when reporting bugs with
  the nightly apport hook
  - update debian/apport/source_thunderbird.py.in
* Set "Channel = Unavailable" if channel-prefs.js doesn't contain a
  channel name
  - update debian/apport/source_thunderbird.py.in
* Ensure that create-tarball can handle there not being a locale blacklist
  - update debian/build/create-tarball.py
* Use makedirs to create the local cache directory
  - 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/thunderbird-dev.links.in
* 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
  - move debian/testsuite.mk to debian/build
  - update debian/rules
* 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/thunderbird-dev.links.in
  - update debian/mozconfig.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, sharutils
    and bzip2. These don't appear to be needed
  - Drop liborbit2-dev - only appears to be 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
  - update debian/rules
  - update debian/build/refresh-supported-locales.pl
* Move debian/mozconfig.in to debian/config
* 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/mozclient.mk
  - remove debian/mozclient/thunderbird.conf
  - update debian/config/branch.mk
  - add debian/build/create-source
  - add debian/build/get-orig-source.mk
  - remove debian/mozclient/thunderbird-remove.binonly.sh
* 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
* Make sure we actually install the crashreporter and apport blacklist file
  for branches which use Breakpad
  - update debian/thunderbird.install.in
* Drop the Mail/News reference in the desktop file - just set the name to
  "Thunderbird Mail". This needs translating for other locales though
  - update debian/thunderbird.desktop.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 thunderbird-dev.install a bit by installing everything in
  - update debian/thunderbird-dev.install.in
* Fix jsreftest failures by setting the correct timezone and locale
  - update debian/testsuite.mk
* Add ${misc:Depends} dependency to transitional language packs
  - update debian/control.langpacks.unavail
* Disable elfhack permanently. It doesn't give us any of the performance
  wins that the official mozilla.org builds get, due to -Wl,-z,relro
  - update debian/rules
  - update debian/mozconfig.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/thunderbird.mk
* Switch to comm-release
  - update debian/mozclient/thunderbird.conf
* Update desktop file translations
  - update debian/thunderbird-trunk.desktop.in
* Drop the profile migrator, as it doesn't really make any sense with the new
  release cycle. Instead, just copy the thunderbird profile (if it exists) to
  thunderbird-trunk (if it doesn't exist)
  - remove debian/migrator/xulapp-profilemigrator
  - update debian/thunderbird.sh.in
  - update debian/thunderbird.install.in
  - update debian/rules
  - update debian/control.in
* Drop patches fixed upstream:
  - remove debian/patches/fix-sdk-bin-install.patch
  - remove debian/patches/series
* xpt_link and xpt_dump have been replaced by xpt.py
  - update debian/thunderbird-dev.install.in
  - update debian/thunderbird-dev.links.in
* Fix LP: #807805 - invalid language packs created because get-xpi-id.py
  exits with "xml.parsers.expat.ExpatError: XML or text declaration not at
  start of entity" exception when the install.rdf starts with empty lines
  - update debian/get-xpi-id.py
* Explicitly specify the mozilla-release repo, as client.py still pulls
  from mozilla-beta
  - update debian/mozclient/thunderbird.conf
* Parse the correct file for the version number
  - update debian/rules
  - update debian/mozclient/thunderbird.conf
* Add transitional ta-lk language pack to pull in thunderbird-locale-ta
  - update debian/control.in
  - refresh debian/control
* Set a Vcs-Bzr URL
  - update debian/control.in
  - refresh debian/control
* Align packaging with firefox:
  - rename debian/apport/blacklist => debian/apport/thunderbird.in
  - rename debian/control => debian/control.in
  - rename debian/thunderbird-dev.install =>
  - rename debian/thunderbird-gnome-support.install =>
  - rename debian/thunderbird.desktop => debian/thunderbird.desktop.in
  - rename debian/thunderbird.install => debian/thunderbird.install.in
  - rename debian/thunderbird.manpages => debian/thunderbird.manpages.in
  - update debian/apport/thunderbird.in
  - update debian/control.in
  - update debian/rules
  - update debian/thunderbird.sh.in
  - update debian/thunderbird.xml.in
  - update debian/thunderbird-dev.install.in
  - update debian/thunderbird-gnome-support.install
  - update debian/thunderbird.desktop.in
  - update debian/thunderbird.install.in
  - update debian/thunderbird.manpages
  - added debian/thunderbird-dev.links.in
  - added debian/thunderbird-globalmenu.dirs.in
  - added debian/thunderbird-mozsymbols.install.in
  - added debian/thunderbird.dirs.in
  - added debian/thunderbird.links.in
  - added debian/thunderbird.lintian-overrides.in
* Build language packs directly from the thunderbird source
  + 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/thunderbird.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
    - add debian/control.langpacks.unavail
    - update debian/control
    - add debian/locales.unavailable
    - 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 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
* Rewrite the launcher script to not wrap around the upstream start
  scripts, but start the Thunderbird binary directly. The upstream start
  scripts contain a lot of complexity for dealing with things that we don't
  need to worry about, and are quite slow. Also, add in the hooks for the
  new profile migrator
  - update debian/thunderbird.sh.in
* Replace the old profile migrator. The previous one relied on hard-coded
  values and fragile shell script that isn't really scalable enough
  now that stable Ubuntu releases see new major Thunderbird versions. The
  new profile migrator doesn't require any hard-coded values, and should
  be lower maintenance
  - add debian/migrator/xulapp-profilemigrator
  - remove debian/migrator/main.c
  - update debian/rules
  - update debian/thunderbird.sh.in
  - update debian/control.in
* 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
* Refreshed patches:
  - update debian/patches/no-dynamic-nss-softokn.patch
  - update debian/patches/unity-globalmenu-build-support.patch
  - update debian/patches/add-syspref-dir.patch
* Support running the Mozilla test suite at build time. Currently, we run
  the following targets: check, jstestbrowser, xpcshell-tests, reftest,
  crashtest and mochitest. Not enabled yet
  - add debian/testsuite.mk
  - update debian/rules
* Don't touch $LIBDIR/.autoreg on install or removal. This has no effect
  with the components registration changes in Gecko >= 2.0
  - update debian/thunderbird.postinst.in
  - remove debian/thunderbird.prerm.in
* Ensure that the files in /etc/thunderbird/profile are cleaned up on
  - update debian/thunderbird.preinst.in
* Drop unneeded patches:
  - drop debian/patches/bz420391_attXXXX_fix_unix_installer.patch (only
    seemed to be needed for static builds)
  - remove bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
    (fixed upstream)
  - remove debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch
    (fixed upstream)
  - remove debian/patches/bzXXX_ftbfs_static_with_system_hunspell.patch
    (not doing static builds now)
  - remove debian/patches/bzXXX_linker_flag_ordering.patch (not doing
    static builds now)
  - remove debian/patches/fix_installdir.patch (not sure what it was
    needed for)
  - remove debian/patches/fix_sdk_install_mimecrypt.patch (fixed upstream)
  - remove debian/patches/lp682742_arm_it_instruction.patch (fixed
  - remove debian/patches/lp_710648_arm_it_instruction_breakpad.patch
    (fixed upstream)
  - remove debian/patches/use-MOZ_APP_LAUNCHER-for-launcher-exec.patch
    (fixed upstream)
  - update debian/patches/series
* Fix LP: #767115 - use a high-res icon for the launcher
  - update debian/thunderbird.links.in

76. By Micah Gersten

* New upstream release v3.1.20 (THUNDERBIRD_3_1_20_BUILD1)
  - see LP: #953720 for USN information

75. By Micah Gersten

* New upstream release v3.1.19 (THUNDERBIRD_3_1_19_BUILD1)
  - see LP: #933399 for USN information

74. By Micah Gersten

* New upstream release v3.1.18 (THUNDERBIRD_3_1_18_BUILD2)
  - see USN-1350-1

73. By Micah Gersten

* New upstream release v3.1.16 (THUNDERBIRD_3_1_16_BUILD2)
  - see USN-1254-1

72. By Micah Gersten

* New upstream release v3.1.15 (THUNDERBIRD_3_1_15_BUILD1)
  - see USN-1213-1

71. By Micah Gersten

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

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.