From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 19 Dec 2018 22:40:37 +0000 (+0000)
Subject: Merge version 2.22.4-1+rpi1 and 2.22.5-1 to produce 2.22.5-1+rpi1
X-Git-Tag: archive/raspbian/2.22.5-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e424bffb0838d61f92eefe5fcdbcafa185e18af0;p=webkit2gtk.git

Merge version 2.22.4-1+rpi1 and 2.22.5-1 to produce 2.22.5-1+rpi1
---

a50ab27c410c877d2fe53eda4c4dc37e74957112
diff --cc debian/changelog
index ea336757ea,b5b0898a64..6c7bc0107b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
- webkit2gtk (2.22.4-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.22.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>  Wed, 28 Nov 2018 03:21:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 19 Dec 2018 22:40:37 +0000
++
+ webkit2gtk (2.22.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/patches/detect-jit.patch:
+     + Drop patch, this has been fixed upstream.
+   * debian/patches/detect-woff.patch:
+     + Refresh.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 13 Dec 2018 20:43:29 +0200
  
  webkit2gtk (2.22.4-1) unstable; urgency=high