From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 18 May 2017 15:51:00 +0000 (+0000)
Subject: Merge version 2.14.6-1+rpi1 and 2.14.7-1 to produce 2.14.7-1+rpi1
X-Git-Tag: raspbian/2.14.7-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=577809efff0007e62cdc576e1d92cc7f194c8400;p=webkit2gtk.git

Merge version 2.14.6-1+rpi1 and 2.14.7-1 to produce 2.14.7-1+rpi1
---

a6f6d8e391863f77950996f76e574ed8aaf26fb1
diff --cc debian/changelog
index 7ed32e5ef9,5ee8725e24..f4ae6098cb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- webkit2gtk (2.14.6-1+rpi1) stretch-staging; urgency=medium
++webkit2gtk (2.14.7-1+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>  Wed, 26 Apr 2017 07:31:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 May 2017 15:50:51 +0000
++
+ webkit2gtk (2.14.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/copyright:
+     + Update copyright years and remove nonexistent files.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 09 May 2017 16:48:39 +0300
  
  webkit2gtk (2.14.6-1) unstable; urgency=high