From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 9 Aug 2018 12:18:16 +0000 (+0100)
Subject: Merge version 2.20.3-1+rpi1 and 2.20.4-1 to produce 2.20.4-1+rpi1
X-Git-Tag: archive/raspbian/2.20.4-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=20959a84b9ae6be9b9f29c020a1f8db91124a898;p=webkit2gtk.git

Merge version 2.20.3-1+rpi1 and 2.20.4-1 to produce 2.20.4-1+rpi1
---

20959a84b9ae6be9b9f29c020a1f8db91124a898
diff --cc debian/changelog
index d204fb9d7f,8b8769cbf0..320e6c4045
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,24 @@@
- webkit2gtk (2.20.3-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.20.4-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>  Wed, 20 Jun 2018 16:23:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 12:18:16 +0000
++
+ webkit2gtk (2.20.4-1) unstable; urgency=high
+ 
+   * New upstream release.
+     + This fixes CVE-2018-4261, CVE-2018-4262, CVE-2018-4263,
+       CVE-2018-4264, CVE-2018-4265, CVE-2018-4266, CVE-2018-4267,
+       CVE-2018-4270, CVE-2018-4272, CVE-2018-4273, CVE-2018-4278,
+       CVE-2018-4284.
+   * Don't use NEWS as an upstream changelog anymore (as required by Debian
+     policy 4.2.0).
+   * debian/control:
+     + Update Standards-Version to 4.2.0.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 06 Aug 2018 16:39:27 +0300
  
  webkit2gtk (2.20.3-1) unstable; urgency=high