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

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:ubuntu/natty/webkit

Robert Ancell (community): Needs Resubmitting on 2010-12-23

Diff: 493 lines (+435/-0)

10 files modified

debian/changelog (+52/-0)
debian/patches/05-fix-jit-on-kfreebsd-i386.patch (+51/-0)
debian/patches/cve-2010-2646.patch (+110/-0)
debian/patches/cve-2010-2651.patch (+38/-0)
debian/patches/cve-2010-2900.patch (+29/-0)
debian/patches/cve-2010-2901.patch (+98/-0)
debian/patches/cve-2010-3120.patch (+27/-0)
debian/patches/series (+7/-0)
debian/patches/typo_webkitwebsettings.patch (+18/-0)
debian/patches/ubuntu-gir-version.patch (+5/-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

22. By Artur Rona on 2010-12-16

  [ 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)

21. By Robert Ancell on 2010-10-21

* debian/patches/ubuntu-gir-version.patch:
  - Simplify patch to fix FTBFS

20. By Robert Ancell on 2010-10-19

* New upstream release
* debian/patches/ubuntu-gir-version.patch:
  - Update to version 1.2

19. By Robert Ancell on 2010-10-18

New upstream release

18. By Robert Ancell on 2010-10-18

* debian/patches/ubuntu-gir-version.patch:
  - Use the 1.2 gobject introspection abi

17. By Sebastien Bacher on 2010-09-06

* 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

16. By Colin Watson on 2010-09-03

* Cherry-pick from Debian's git repository:
  - Do not print a debugging message before doing the domain check
    (Gustavo Noronha Silva).

15. By Sebastien Bacher on 2010-08-11

* Resync on Debian
* WebKit/gtk/JSCore-1.0.gir:
  - updated for the new gobject introspection version
  - don't update the js version, thanks Maia Kozheva (lp: #616387)

14. By Sebastien Bacher on 2010-08-10

WebKit/gtk/JSCore-1.0.gir: set gir version to 1.1

13. By Sebastien Bacher on 2010-08-10

Rebuild with the new gobject introspection