Merge version 2.14.6-1+rpi1 and 2.16.3-2 to produce 2.16.3-2+rpi1

diff --cc debian/changelog
index 7ed32e5ef9ba3849dd38a61bc72b84ab07b81c1f,99c5baa650e3ea06a6288bad037e6118ae4cb1a8..b8f544ed9f15449fb23daa8f64b58126f427f1d4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,44 +1,52 @@@
- webkit2gtk (2.14.6-1+rpi1) stretch-staging; urgency=medium
++webkit2gtk (2.16.3-2+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>  Mon, 26 Jun 2017 00:16:47 +0000
 +
- webkit2gtk (2.14.6-1) unstable; urgency=high
+ webkit2gtk (2.16.3-2) unstable; urgency=medium
+ 
+   * Upload to unstable (Closes: #836055).
+   * debian/watch:
+     + Stop scanning the 2.15 branch.
+   * debian/gbp.conf:
+     + Update upstream branch name.
+   * The WebKitGTK+ security advisory WSA-2017-0004 lists the following
+     security fixes in the latest versions of WebKitGTK+:
+     + CVE-2017-2505, CVE-2017-2508, CVE-2017-2514, CVE-2017-2521
+       (fixed in 2.16.0).
+     + CVE-2017-2504, CVE-2017-2506, CVE-2017-2515, CVE-2017-2525,
+       CVE-2017-2526, CVE-2017-2528, CVE-2017-2530, CVE-2017-2531,
+       CVE-2017-2536, CVE-2017-2544, CVE-2017-2547, CVE-2017-2549,
+       CVE-2017-6980, CVE-2017-6984 (fixed in 2.16.1).
+     + CVE-2017-2496, CVE-2017-2510, CVE-2017-2539 (fixed in 2.16.3).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 01 Jun 2017 00:29:57 +0300
+ 
+ webkit2gtk (2.16.3-1) experimental; urgency=medium
+ 
+   * New upstream release
+     + This fixes CVE-2017-2496, CVE-2017-2539 and CVE-2017-2510.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 24 May 2017 15:17:20 +0200
+ 
+ webkit2gtk (2.16.2-1) experimental; urgency=medium
  
    * New upstream release.
-     + This fixes CVE-2016-9643, CVE-2017-2364, CVE-2017-2367,
-       CVE-2017-2377, CVE-2017-2392, CVE-2017-2394, CVE-2017-2415,
-       CVE-2017-2419, CVE-2017-2442, CVE-2017-2446, CVE-2017-2454,
-       CVE-2017-2459, CVE-2017-2460, CVE-2017-2465, CVE-2017-2466,
-       CVE-2017-2468, CVE-2017-2470, CVE-2017-2471, CVE-2017-2475,
-       CVE-2017-2476, CVE-2017-2481.
+   * debian/patches/fix-ftbfs-armel.patch:
+     + Refresh.
+   * debian/patches/fix-ftbfs-x32.patch:
+     + Remove, this one is now upstream.
+   * debian/copyright:
+     + Update copyright years and remove nonexistent files.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 09 May 2017 12:21:07 +0300
+ 
+ webkit2gtk (2.16.1-1) experimental; urgency=medium
+ 
+   * New upstream release (Closes: #853705).
    * debian/control:
      + Downgrade libwebkit2gtk-4.0-37-gtk2 from Recommends to Suggests,
        since most apps that depend on webkit2gtk don't need this.