Sync webkit 1.6.1-5 (main) from Debian unstable (main)

Bug #888265 reported by Jeremy Bícha
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
webkit (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Please sync webkit 1.6.1-5 (main) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
The only relevant remaining delta is:
* Ubuntu makes libwebkitgtk1.0-common conflict with libwebkit-1.0-common
but the packages install files to differenly named directories so there
is no conflict.
* Ubuntu removed the private symbols but this isn't important
enough to diverge from Debian.

  * debian/patches/10_cherrypick_r95940.patch:
    - Avoid crashing on scrollbar unparent/reparent (LP: #851044)
  * debian/patches/10_cherrypick_r95940.patch:
    - Avoid crashing on scrollbar unparent/reparent (LP: #851044)
  * debian/rules: armel library has a ton of extra uninteresting
    JITStubThunked_* symbols; do not call dh_makeshlibs with -c4 on armel
    builds.
  * New upstream release.
  * debian/libwebkitgtk-1.0-0.symbols: Update for new version.
  * debian/libwebkitgtk-3.0-0.symbols: Update for new version.
  * New upstream version
  * 01_expose_less_symbols.patch:
    - dropped this debian patch, debian dropped it as well
  * 02_no_amd64_overcommit: dropped, the issue is fixed in this version
  * 03_g_const_return.patch: upstream commit, don't use G_CONST_RETURN
  * New upstream version, drop patches which are in the new version
  * Updated symbols lists
  * debian/patches/04_fix_header_for_strict.patch:
    - Add upstream patch to fix headers for compilation with strict mode
  * debian/patches/04_fix_header_for_strict.patch:
    - Add upstream patch to fix headers for compilation with strict mode
  * New upstream release
  * debian/patches/03_fixing_jit_arm_crashes.patch:
    - Applied upstream
  * debian/patches/03_gtk_doc.patch:
    - Fix documentation build
  [ Ricardo Salveti de Araujo ]
  * debian/patches/03_fixing_jit_arm_crashes.patch:
    - Fixing JIT ARM crashes (LP: #728211)
  * Add bzr-builddeb configuration (merge mode).
  * Add 02_no_amd64_overcommit: Do not try to reserve 1 GB of memory for pool
    pages on x86_64, as this will crash on machines with less than ~ 1.5 GB
    RAM. This only works if overcommitting memory is enabled, which we don't
    have by default. (LP: #710582)
  * New upstream release
  * Merge with Debian experimental, remaining Ubuntu changes:
  * debian/control:
    - Fix versions in build-depends
    - Don't build-depend on libgeoclue-dev (it's in Universe)
    - Add Vcs-Bzr link
    - Make libwebkitgtk-1.0-common conflict with libwebkit-1.0-common
  * debian/rules:
    - Fix documentation build
    - Disable geolocation support (dependencies in Universe)
  * debian/*.symbols:
    - Use regexp to add symbols that only appear on the ARM build
    - Use regexp to disable C++ private symbols
    - Remove geolocation symbols
    - Updated
  * debian/control:
    - Use new libgail package names
  * debian/control:
    - Use new GTK3 package names
  * New upstream release (LP: #718474)
  * debian/control:
    - Bump build-depends on libsoup2.4-dev
  * debian/rules:
    - Use new paths
  * debian/libwebkitgtk-1.0-0.symbols:
  * debian/libwebkitgtk-3.0-0.symbols:
    - Updated
  * debian/patches/01_missing_armv7_files.patch:
  * debian/patches/10_gtk3.patch:
    - Applied upstream
  * debian/patches/01_gtk_doc_paths.patch:
    - Fix documentation paths
  * debian/patches/10_gtk3.patch:
    - With GTK+ 3, include <gtk/gtkx.h> for GtkSocket (LP: #714457).
  * Synchronize on Debian, remaining diff is:
  * debian/libwebkitgtk-1.0-0.symbols, debian/libwebkitgtk-3.0-0.symbols:
    - Use regexp to add symbols that only appear on the ARM build
    - Use regexp to disable C++ private symbols
  * debian/patches/01_missing_armv7_files.patch:
    - Add files missing for ARMv7 build
  * debian/control, debian/rules:
    - build without geoclue, it's in universe
>>> ENTER_EXPLANATION_HERE <<<

Changelog entries since current precise version 1.4.3-0ubuntu3:

webkit (1.6.1-5) unstable; urgency=low

  * debian/rules:
  - also build with stabs debug symbols format when under s390x
    patch by Aurelien Jarno <email address hidden> (Closes: #637228)
  * debian/control:
  - add Breaks for midori and claws-mail-fancy-plugin versions that
    were using the private webkit_web_view_get_selected_text symbol
    (Closes: #646095)

 -- Gustavo Noronha Silva <email address hidden> Tue, 01 Nov 2011 23:20:19 -0200

webkit (1.6.1-4) unstable; urgency=low

  * debian/patches/03_freebsd-fix.patch:
  - fix FreeBSD 64 bits build
  * debian/patches/04_pkgconfig-fix.patch:
  - import patch from upstream to fix pkg-config file to require the JSC
    one

 -- Gustavo Noronha Silva <email address hidden> Sun, 23 Oct 2011 20:10:53 -0200

webkit (1.6.1-3) unstable; urgency=low

  * debian/patches/01_double-conversion.patch:
  - imported from upstream; fixes s390 double conversion, modified
    to also include IA64
  * debian/rules:
  - try reducing the disk space used to build webkit by using thin
    archives
  - disable silent rules to make debugging easier

 -- Gustavo Noronha Silva <email address hidden> Fri, 21 Oct 2011 10:38:17 -0200

webkit (1.6.1-2) unstable; urgency=low

  * Rename source package back to webkit
  * debian/control:
  - Build-Depend on gawk, since our GNUmakefile.in has lines that are too
    long for mawk, which results in a broken GNUmakefile
  * debian/rules:
  - re-enable installing documentation

 -- Gustavo Noronha Silva <email address hidden> Tue, 18 Oct 2011 09:59:20 -0200

webkitgtk+ (1.6.1-1) experimental; urgency=low

  * New upstream release
  * debian/patches/01_fix-introspection.patch:
  - Removed; applied upstream
  * debian/patches/02_notebook_scroll.patch:
  - Patch by Josselin Mouette <email address hidden> to ignore alt+wheel
    (Closes: #640980)

 -- Gustavo Noronha Silva <email address hidden> Mon, 26 Sep 2011 23:24:37 -0300

webkitgtk+ (1.5.2-1) experimental; urgency=low

  * New upstream development release
  * debian/patches/01_spoof-ua-for-calendar.patch:
  - Remove; applied upstream
  * debian/patches/01_fix-introspection.patch:
  - Fix the introspection build

 -- Gustavo Noronha Silva <email address hidden> Wed, 24 Aug 2011 21:43:19 -0300

Jeremy Bícha (jbicha)
Changed in webkit (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Martin Pitt (pitti) wrote :

seems fine, approved.

Changed in webkit (Ubuntu):
status: New → Confirmed
Revision history for this message
Martin Pitt (pitti) wrote :

synced

Changed in webkit (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.