Chromium Browser

Merge lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.quantal into lp://qastaging/~chromium-team/chromium-browser/chromium-browser.quantal

chromium-browser.quantal
Merge into chromium-browser.quantal

Proposed by Ken VanDine on 2012-07-06

Status:

Merged

Merged at revision:

747

Proposed branch:

lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.quantal

Merge into:

lp://qastaging/~chromium-team/chromium-browser/chromium-browser.quantal

Diff against target:

2850 lines (+2555/-102)

15 files modified

debian/apport/chromium-browser.py (+9/-8)
debian/changelog (+64/-0)
debian/control (+6/-2)
debian/patches/1-infobars.patch (+193/-0)
debian/patches/2-get-domain-tld.patch (+255/-0)
debian/patches/3-chrome-xid.patch (+38/-0)
debian/patches/arm.patch (+50/-0)
debian/patches/chromeless-window-launch-option.patch (+860/-0)
debian/patches/desktop-integration-settings.patch (+1031/-0)
debian/patches/dlopen_sonamed_gl.patch (+3/-16)
debian/patches/fix-armhf-ftbfs.patch (+3/-27)
debian/patches/grd_parse_fix.patch (+12/-0)
debian/patches/series (+7/-2)
debian/patches/ubuntu_dont_overwrite_default_download_directory.patch (+0/-47)
debian/rules (+24/-0)

To merge this branch:

bzr merge lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.quantal

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Chromium team		2012-07-06	Pending
Review via email: mp+113785@code.qastaging.launchpad.net

Description of the change

Force building with gcc 4.6 to at least get a build into quantal and fix ftbfs (LP: #992212)

lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.quantal updated on 2012-08-06

737. By Ken VanDine on 2012-07-10: * New upstream release from the Stable Channel
* debian/control
  - Added build depends binutils-gold, libssl-dev and subversion
* -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
  - no longer needed
* debian/rules
  - force to build with gcc 4.6 to fix ftbfs (LP: #992212)
  - don't build with -Werror
* debian/control
  - add build depends for g++-4.6-multilib
738. By Ken VanDine on 2012-07-10: * debian/patches/grd_parse_fix.patch
- Patched to fix broken XML until we can get a proper fix for
chromium-translation-tools.
739. By Ken VanDine on 2012-07-10: Bumped standards version to 3.9.3
740. By Ken VanDine on 2012-07-10: merged
741. By Ken VanDine on 2012-07-11: * debian/rules
  - explicitly set arm_float_abi=hard for armhf builds and let the rest
    fallback to softfp
  - do not use third_party/gold as the linker.
  - enable compile-time dependency on gnome-keyring
* debian/patches/vpx.patch
  - patch from debian to fix FTBFS on armel
* debian/patches/arm.patch
  - patch from debian to fix FTBFS on armel
742. By Ken VanDine on 2012-07-11: Added build depends binutils-gold, libvpx-dev,libssl-dev and subversion
743. By Ken VanDine on 2012-07-12: don't build depend on binutils-gold for armel
744. By Ken VanDine on 2012-07-12: releasing version 20.0.1132.47~r144678-0ubuntu1
745. By Ken VanDine on 2012-07-12: * debian/control
- Dropped build depends for libvpx-dev
* debian/apport:
- Update apport hook for python3 (LP: #1013171)
patch made with the help of Edward Donovan
746. By Ken VanDine on 2012-07-13: releasing version 20.0.1132.47~r144678-0ubuntu2
747. By Ken VanDine on 2012-08-06: releasing version 20.0.1132.47~r144678-0ubuntu3