From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 17 Oct 2018 03:46:48 +0000 (+0100)
Subject: Merge version 2.18.6-1+rpi1 and 2.18.6-1~deb9u1 to produce 2.18.6-1~deb9u1+rpi1
X-Git-Tag: archive/raspbian/2.18.6-1_deb9u1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5bab75ed4bd16bf6abd45cae326a17979fb616ce;p=webkit2gtk.git

Merge version 2.18.6-1+rpi1 and 2.18.6-1~deb9u1 to produce 2.18.6-1~deb9u1+rpi1
---

c9f5f9c583b0a0edf422508ac3a9b2a7574331be
diff --cc debian/changelog
index ba89d7d43a,692f43c187..b1b0beca64
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- webkit2gtk (2.18.6-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.6-1~deb9u1+rpi1) stretch-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>  Thu, 01 Feb 2018 15:14:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 17 Oct 2018 03:46:47 +0000
++
+ webkit2gtk (2.18.6-1~deb9u1) stretch; urgency=medium
+ 
+   * Team upload.
+   * New security and bugfix release backported from Buster.
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Mon, 29 Jan 2018 20:54:00 -0500
  
  webkit2gtk (2.18.6-1) unstable; urgency=high