From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 2 Nov 2017 14:17:29 +0000 (+0000)
Subject: Merge version 2.18.1-1+rpi1 and 2.18.2-1 to produce 2.18.2-1+rpi1
X-Git-Tag: archive/raspbian/2.18.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89c159b4908a77769d53eac173f562bfb13d1d40;p=webkit2gtk.git

Merge version 2.18.1-1+rpi1 and 2.18.2-1 to produce 2.18.2-1+rpi1
---

89c159b4908a77769d53eac173f562bfb13d1d40
diff --cc debian/changelog
index d04acc06d7,5527012306..de1aa53fa5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
- webkit2gtk (2.18.1-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.2-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)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Oct 2017 15:08:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Nov 2017 14:17:28 +0000
++
+ webkit2gtk (2.18.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/control:
+     + Set the minimum versions of these build dependencies: cmake >= 3.3,
+       libcairo2-dev >= 1.10.2, libfontconfig1-dev >= 2.8, and
+       libgcrypt20-dev >= 1.7.0, libxml2-dev >= 2.8.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 27 Oct 2017 15:05:15 +0200
  
  webkit2gtk (2.18.1-1) unstable; urgency=medium