From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 30 Jun 2017 12:09:15 +0000 (+0100)
Subject: Merge version 2.16.3-2+rpi1 and 2.16.5-1 to produce 2.16.5-1+rpi1
X-Git-Tag: archive/raspbian/2.16.5-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7597eec19a22fc35e62a0d13acbeb33412b875b;p=webkit2gtk.git

Merge version 2.16.3-2+rpi1 and 2.16.5-1 to produce 2.16.5-1+rpi1
---

522863d1c58df7b580c3f0980f542a960eb0ead3
diff --cc debian/changelog
index b8f544ed9f,26591984c8..04f851fdd3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- webkit2gtk (2.16.3-2+rpi1) stretch-staging; urgency=medium
++webkit2gtk (2.16.5-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Jun 2017 00:16:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 30 Jun 2017 12:09:14 +0000
++
+ webkit2gtk (2.16.5-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #865772).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 27 Jun 2017 10:29:49 +0300
+ 
+ webkit2gtk (2.16.4-1) unstable; urgency=high
+ 
+   * New upstream release.
+     + This fixes CVE-2017-2538.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 20 Jun 2017 17:24:48 +0300
  
  webkit2gtk (2.16.3-2) unstable; urgency=medium