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

Proposed by Ken VanDine
Status: Merged
Merged at revision: 737
Proposed branch: lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.precise
Merge into: lp://qastaging/~chromium-team/chromium-browser/chromium-browser.precise
Diff against target: 420 lines (+142/-103)
10 files modified
debian/apport/chromium-browser.py (+9/-8)
debian/changelog (+32/-0)
debian/control (+6/-2)
debian/patches/arm.patch (+50/-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 (+2/-2)
debian/patches/ubuntu_dont_overwrite_default_download_directory.patch (+0/-47)
debian/rules (+25/-1)
To merge this branch: bzr merge lp://qastaging/~ken-vandine/chromium-browser/chromium-browser.precise
Reviewer Review Type Date Requested Status
Chromium team Pending
Review via email: mp+116486@code.qastaging.launchpad.net

Description of the change

  [ Matthieu Baerts ]
  * debian/apport:
   - Update apport hook for python3 (LP: #1013171)
     patch made with the help of Edward Donovan

  [ Ken VanDine ]
  * New upstream release from the Stable Channel
  * debian/control
    - Added build depends binutils-gold, libssl-dev and subversion
    - Bumped standards version to 3.9.3
    - don't build depend on binutils-gold for armel
    - add build depends for g++-4.6-multilib
  * 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
    - don't build with -Werror
    - include armv7 in GYP_DEFINES for 11.10, 12.04 and 12.10. Fixes
      FTBFS on arm (LP: #993080)
  * -debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
    - no longer needed
  * debian/patches/grd_parse_fix.patch
    - Patched to fix broken XML until we can get a proper fix for
      chromium-translation-tools.
  * debian/patches/arm.patch
    - patch from debian to fix FTBFS on armel

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

I've merged this in, it would be good if we could get a dep3 header for the arm patches for future uploads.

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.

Subscribers

People subscribed via source and target branches