lp:~ari-tczew/webkit/lp-691104

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~ubuntu-desktop/webkit/ubuntu

Ubuntu Desktop: Pending requested 2011-01-11

Robert Ancell: Pending requested 2011-01-08

Diff: 121 lines (+75/-9)

4 files modified

debian/changelog (+52/-9)
debian/patches/series (+1/-0)
debian/patches/typo_webkitwebsettings.patch (+18/-0)
debian/patches/ubuntu-gir-version.patch (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #691104: Merge webkit 1.2.5-2.1 (main) from Debian unstable (main)

Wishlist

Invalid

Link a bug report

Related blueprints

5. By Artur Rona on 2011-01-08

bzr add

4. By Artur Rona on 2011-01-08

Updated DEP3 tag.

3. By Artur Rona on 2011-01-08

[ Artur Rona ]
* Merge from debian unstable. Remaining changes: (LP: #691104)
  - debian/control: Drop Build-Depends on gir-repository-dev since
    we don't have this package in archive.
  - debian/patches/ubuntu-gir-version.patch: Use the 1.2 gobject
    introspection abi.
[ David Stansby ]
* debian/patches/typo_webkitwebsettings.patch: Fix typo. (LP: #552718)
[ Robert Ancell ]
* debian/control: Add Vcs-Bzr link related to Ubuntu Desktop Team.
* debian/patches/ubuntu-gir-version.patch:
  - Simplify patch to fix FTBFS
* debian/patches/ubuntu-gir-version.patch:
  - Change the alias definitions to work with the latest gobject-introspection
* New upstream release
* debian/patches/ubuntu-gir-version.patch:
  - Use the 1.2 gobject introspection abi
* Resync on Debian,
  remaining changes:
* debian/control:
  - don't build-depends on gir-repository-dev it's not required
* debian/patches/ubuntu-gir-version.patch:
  - use the current gobject introspection abi

2. By Robert Ancell on 2010-12-22

* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Don't build-depends on gir-repository-dev it's not required
  - Use standards-version 3.9.1
  - Add Vcs-Bzr link
  - Use the current gobject introspection abi
* Non-maintainer upload.
* Add patch 05-fix-jit-on-kfreebsd-i386.patch by Petr Salinger and
  Michael Dorrington: Fixes Javascript JIT crashing on kfreebsd-i386
  (closes: #598956).
* Unapply 02-pool-fixup-and-sparc-support.patch and
  04-spoof-user-agent-to-google.patch in git. This prevents the
  creation of an unwanted debian-changes patch.
* New upstream release
- fixes the following CVES:
    CVE-2010-1780 CVE-2010-3113 CVE-2010-1814 CVE-2010-1812
    CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
    CVE-2010-3116 CVE-2010-3257 CVE-2010-3259
* fix cve-2010-2646: security origin bypass using IFRAME elements.
* fix cve-2010-2651: vulnerability in css style rendering.
* fix cve-2010-2900: vulnerability with large canvas elements when using the
  SKIA library.
* fix cve-2010-2901: vulnerability in the rendering implementation.
* fix cve-2010-3120: vulnerability in geolocation feature.

1. By Robert Ancell on 2010-12-22

initial webkit import