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

Proposed by Ken VanDine
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/ (+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
Reviewer Review Type Date Requested Status
Chromium team Pending
Review via email:

Description of the change

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

To post a comment you must log in.
737. By Ken VanDine

* 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

* debian/patches/grd_parse_fix.patch
  - Patched to fix broken XML until we can get a proper fix for

739. By Ken VanDine

Bumped standards version to 3.9.3

740. By Ken VanDine


741. By Ken VanDine

* 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

Added build depends binutils-gold, libvpx-dev,libssl-dev and subversion

743. By Ken VanDine

don't build depend on binutils-gold for armel

744. By Ken VanDine

releasing version 20.0.1132.47~r144678-0ubuntu1

745. By Ken VanDine

* 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

releasing version 20.0.1132.47~r144678-0ubuntu2

747. By Ken VanDine

releasing version 20.0.1132.47~r144678-0ubuntu3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches

to all changes: