Merge lp://qastaging/~debfx/firefox/firefox-4.0-kde into lp://qastaging/firefox/trunk

* Add support for running debhelper files through the Mozilla text
  preprocessor. This means we'll be able to support the different build
  configurations without having a huge debian/rules with lots of logic in
  - update debian/rules

* Some cosmetic changes to debian/rules - the includes are all near to the top now, where people expect them to be
* Generate the pre-processed packaging files earlier in the build, else it fails

* Fix DEB_MIN_SYSDEPS again, so it should be possible to build with either option again. Note that FF-on-XR is totally untested

* Install Ubuntu preferences as vendor.js

* Create the buildsymbols in common-install-arch, and move the installation in to debhelper files
  - update debian/rules
  - update debian/firefox-core.install.pp
  - add debian/firefox-mozsymbols.install.pp
* Remember to preprocess firefox.dirs.in and abrowser.dirs.in
  - update debian/rules

Merge from lp:firefox

* Blacklist plugin-container in Apport for DEB_MIN_SYSDEPS builds
  - rename debian/apport/firefox.in => debian/apport/firefox.pp
  - update debian/apport/firefox.pp

* Refresh patches
  - update debian/patches/browser_branding.patch
  - update ebian/patches/bz591331_att469858_breakpad_allow_ptrace.patch
  - update debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch

* Disable more IPC tests which are causing the builds to hang
  - update debian/testsuite.mk

* Preprocess the debhelper files as a dependency of pre-build rather than common-install-arch. I only moved it when I was including config/automake.mk (which assumes that the configure is already done)
  - update debian/rules

* 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
  - update debian/firefox-mozsymbols.install.pp
  - add debian/mozconfig.pp
  - update debian/rules

* Create the build symbols after running make install, else dh_strip fails later on
  - update debian/rules

* Export MOZILLA_OFFICIAL to the environment rather than putting it in mozconfig (which doesn't work)
  - update debian/rules
  - update debian/mozconfig.pp

* Don't hardcode MOZ_OBJDIR and DEB_BUILDDIR in the various places it is used
  - update debian/rules
  - update debian/firefox-mozsymbols.install.pp

* Drop the functionality to disable patches on a pre-release basis - we're not actually using it in this branch yet. We can always bring it back again if we need it

* Don't export @BINREAL@ from debian/rules - this was an unnecessary hack not needed now we are using a preprocessor
  - update debian/rules
  - update debian/apport/firefox.pp

* Tidy up the testsuite code a little

Oops, MOZ_OBJDIR needs to be defined before including testsuite.mk

B'ah! Set MOZ_OBJDIR correctly now

* Merge 2 targets in debian/rules (again). Move the installation of the desktop files and Apparmor profile in to the debhelper files
  - update debian/rules
  - update debian/firefox.install.pp
  - remove debian/firefox.dirs.in
  - update debian/firefox-core.install.pp
  - update debian/abrowser.install.pp
  - remove debian/abrowser.dirs.in

* Don't use relative paths in testsuite.mk - especially for , as this breaks the testsuite
  - update debian/testsuite.mk

* Improve dependency tracking in the build, which also means the test-suite doesn't run twice
  - update debian/testsuite.mk
  - update debian/rules

* Fix an issue with a missing leading slash on some paths, caused by r691
  - update debian/usr.bin.firefox.apparmor.10.10
  - update debian/usr.bin.firefox.apparmor.10.04
  - update debian/usr.bin.firefox.apparmor.9.10
  - update debian/firefox.sh.in
  - update debian/rules

* General tidy-ups in debian/rules

* Fix an issue substituting the branding name in to the desktop file. The intention was that the pre-release versions would have the version number in the name
  - update debian/rules

* Add support for building with PGO. Add a build option (DEB_BUILD_PGO)
  which will run the build with make -f client.mk profiledbuild. This is
  off by default, and requires GCC 4.5 anyway
  - update debian/rules
  - update debian/mozconfig.pp

* Disable some new IPC tests
  - update debian/testsuite.mk

* Drop debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch again now it's landed upstream

AppArmor: allow mmap for temporary files that we own (LP: #662918)

* AppArmor
  - add owner read to environ and auxv in @{PROC} as well as
    /etc/lsb-release read and expr ix for the crash reporter

update path for Xubuntu default settings (LP: #664093)

* Refresh patches after landing of (bmo: 601830) aka app.update.url.manual for
  nightly builds should point to the nightly builds
  - update debian/patches/firefox-profilename.patch

* Fix a typo

* Add temporary change to clean up rogue Apparmor profile on upgrade for
  current nightly testers
  - update debian/firefox-core.preinst.in

* Disable gnomevfs support on >= 11.04 (LP: #661287)
  - update debian/rules
  - update debian/mozconfig.pp

* Run all pre-processed files through the Mozilla preprocessor, rather than having 2 steps (using sed)

* Drop abrowser from the Firefox source package:
  - remove debian/abrowser-gnome-support.install.in
  - remove debian/abrowser-gnome-support.postinst.in
  - remove debian/abrowser-gnome-support.prerm.in
  - remove debian/abrowser.desktop.in
  - remove debian/abrowser.install.in
  - remove debian/abrowser.links.in
  - remove debian/abrowser.xml.in
  - update debian/control
  - rename debian/firefox-core.dirs.in => debian/firefox.dirs.in
  - rename debian/firefox-core.docs.in => debian/firefox.docs.in
  - remove debian/firefox.install.in
  - rename debian/firefox-core.install.in => debian/firefox.install.in
  - update debian/firefox.install.in
  - remove debian/firefox.links.in
  - rename debian/firefox-core.links.in => debian/firefox.links.in
  - update debian/firefox.links.in
  - rename debian/firefox-core.postinst.in => debian/firefox.postinst.in
  - rename debian/firefox-core.postrm.in => debian/firefox.postrm.in
  - rename debian/firefox-core.preinst.in => debian/firefox.preinst.in
  - rename debian/firefox-core.prerm.in => debian/firefox.prerm.in
  - update debian/firefox.sh.in
  - update debian/mozclient/firefox-4.0.conf
  - remove debian/patches/awesome_branding_updates.patch
  - remove debian/patches/browser_branding.patch
  - update debian/patches/series
  - update debian/rules
  - remove debian/ubuntu-abrowser.js.in

* New upstream snapshot 4.0 B8 HG20101103r56843

* Don't build with -pie on Natty (LP: #663294)
  - update debian/rules

* Fix a couple of small errors

Revert r707 for now, as the preprocessor chokes on the include's in the apparmor profile

* Revert a change from r711 too

* Auto-generate debian/control in the clean target, auto-populating
  the build-depends
  - add debian/control.pp
  - update debian/rules
  - update debian/mozconfig.pp

* Don't autogenerate debian/control automatically, it's too fragile. And work around a CDBS issue. *sigh*

* Actually, revert the last commit. We should autogenerate debian/control in the clean target

* Fix the logic for switching off gnomevfs support

* Enable GIO support
  - update debian/mozconfig.pp

* Fix the case where gnomevfs is disabled

* Drop unneeded patches
  - remove debian/patches/bz386904_config_rules_install_dist_files.patch
  - remove debian/patches/ftbfs_crashreporter.patch
  - update debian/patches/series

* Rewrite the launcher script to not wrap around the upstream start
  scripts, but start the Firefox 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/firefox.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 Firefox 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/firefox.sh.in
  - update debian/firefox.install.pp
  - update debian/control

* Don't run debian/control through the pre-processor, to avoid having to run pre-build as part of clean

* Add a license header to the profile migrator

* Fix a small error

* Automate the checking of the version-compare logic in the profile migrator

* Fix python-gtk2 depends

* Display the StartupWMClass as the browser name in the profile migrator

* Set WM Class and icon name on the dialog, and also make the primary text bigger

* Add quotes around STARTUP_WM_CLASS in debian/firefox.sh.in, just in case the implementation has spaces in it

* Refresh patches after landing of bmo: 596075 aka Move First-Run Video To
  Be A Tab Pointing To A Mozilla-Hosted Web Page
  - update debian/patches/firefox-profilename
* Refresh patches after landing of bmo: 588410 aka Fix make install to
  work with omnijar
  - remove debian/patches/bz588410_fix_make_install_with_omnijar.patch
  - update debian/patches/series
* Don't install run-mozilla.sh and upstream firefox shell script
  - update debian/firefox.install.pp
* Fix launcher script to work with FF-on-XR builds
  - rename debian/firefox.sh.in => debian/firefox.sh.pp
  - update debian/firefox.sh.pp

* When importing settings from a beta profile, don't abandon the source profile. This was only necessary with the previous profile migrator because it triggered the dialog on discovery of non-abandoned beta profiles. The new one doesn't require this.

This means that the profile migrator now supports persistently named profiles, such as firefox-next and firefox-trunk, without breaking them every time the branch series is updated

* Add another hunk for the last commit

* Make the ASKLATER option in the profile migrator work correctly by writing the old series version to the state file if it doesn't already exists, so it triggers the migrator again on the next run

* Fix some syntax errors in various places

* Port bz460917_att350845_reload_new_plugins to Firefox 4 so that
  we can start the plugin installer without throwing an exception
  - update debian/patches/bz460917_att350845_reload_new_plugins.patch

* Revert the compile-time checks to run-time checks in the launcher
  script, as the preprocessor removes the #!/bin/sh line
  - rename debian/firefox.sh.pp => debian/firefox.sh.in
  - update debian/firefox.sh.in
  - update debian/rules

* Change the marker used by the preprocessor to %% (rather than #). This means we can run everything through the preprocessor without removing comments or other import lines from shell scripts, and means we drop the second step of running everythinh through sed

* Remove an unneeded step from clean

* Don't use update-notifier for the restart required notification - it
  is redundant having 2 separate mechanisms, and the update-notifier
  notification was never translated properly anyway. This means we rely
  on the in-browser notification from ubufox
  - remove debian/firefox-restart-required.update-notifier.in
  - update debian/firefox.install.in
  - update debian/firefox.postinst.in
  - update debian/rules

* Build with --enable-jsd in the hope that Venkman might start working
  - update debian/mozconfig.in

* Make sure our vendor.js preferences are included in the build
  - rename debian/ubuntu-firefox.js.in => debian/vendor.js.in
  - update debian/rules
  - update debian/patches/install_ubuntu_prefs.patch

* Don't build with --enable-jsd, venkman is just totally broken on FF4.0 right now

* Really don't build with -pie this time

* Rebase patches after landing of bmo: 606289 aka Fix logo link in about:
  - update debian/patches/firefox-profilename

* Add x-scheme-handler magic to desktop files
  - update debian/firefox.desktop.in
  - update debian/firefox-beta.desktop.in
  - update debian/firefox-nightly.desktop.in
  - update debian/firefox-unofficial.desktop.in

* Revert r708 and add abrowser again

* New upstream snapshot 4.0 B8 HG 20101115r57519

* Consolidate some of the variables used in the debhelper files
* Add a fix for dealing with unversioned source packages
* Drop part of firefox-fsh to not hard-code the install locations to Firefox. This guarantees that we'll
  remain parallel installable with Firefox in Natty for now

* Fix the profile migrator to not crash on profiles where
  'LastVersion=Safe Mode' (LP: #674607)
  - update debian/migrator/xulapp-profilemigrator

* Bump minimum NSS / NSPR version
  - update debian/rules
* Fix the profile migrator to not hang when ~/.mozilla doesn't exist, and
  other improvements- update debian/migrator/xulapp-profilemigrator
  - update debian/migrator/xulapp-profilemigrator
* Build with --enable-startup-notification again, this got dropped
  in the 3.6 => 4.0 update
  - update debian/mozconfig.in
* Ship the testpilot extension for beta as per the official builds, based
  on the discussion on #developers. We achieve this by building with
  --enable-update-channel=beta for the beta milestones only. The update
  channel isn't used anywhere at runtime because we disable the updater.
  This means that Ubuntu users can participate in testpilot user studies
  in Natty
  - update debian/rules
  - update debian/firefox-core.install.in
  - update debian/mozconfig.in
* Add a hack to the launcher to handle being launched from an alternative,
  which is a symlink to the launcher script, and breaks the current launch
  mechanism. Also remove a useless stat() from the current script
  - update debian/firefox.sh.in
* Re-add patch that got dropped to not remove and re-add search plugins
  during upgrade
  - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch
  - update debian/patches/series

Really add patch this time

pull in natty apparmor changes

* Move libmozgnome.so to the main package in common-binary-predeb-arch.
  The previous method of deleting it from -gnome-support and copying it to
  the main package from debian/tmp in each of the binary-predeb targets
  meant that we were shipping an unstripped copy, which caused a lintian
  error. This new method ensures we retain the stripped SO and we still
  only move it after dh_shlibdeps has run
  - update debian/rules

* Refresh patches

update AppArmor profiles to what is in firefox-4.0

* Change xubuntu applications defaults list in natty apparmor profile; Path
  changed in xubuntu-default-settings (11.04.0)
  - update usr.bin.firefox.apparmor.11.04

debian/usr.bin.firefox.apparmor.11.04: remove redundant abstractions

* Merge from lp:~debfx/firefox/firefox-4.0-kde

* Generate the en-US xpi at build time again for importing in to Launchpad
  - update debian/rules
  - update debian/translation-support/install.rdf.in

Refresh KDE patches