Merge version 2.20.0-2+rpi1 and 2.20.1-1 to produce 2.20.1-1+rpi1

diff --cc debian/changelog
index c2c9fa31744368ee0d5c25d15a0382b033565651,37c83d73f0a47c5401ef2d24bfe459271e03d3d6..095587ea5ca90539c4099607d3242c315e7d52b1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,27 +1,35 @@@
- webkit2gtk (2.20.0-2+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.20.1-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>  Wed, 28 Mar 2018 22:44:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Apr 2018 17:00:08 +0000
++
+ webkit2gtk (2.20.1-1) unstable; urgency=medium
+ 
+   [ Alberto Garcia ]
+   * New upstream release.
+   * debian/rules:
+     + Ubuntu doesn't install changelogs with dh_installchangelogs, so
+       let's use dh_installdocs instead (but keep dh_installchangelogs for
+       Debian).
+   * debian/control:
+     + Update Standards-Version to 4.1.4 (no changes needed).
+ 
+   [ Jeremy Bicha ]
+   * The WebKitGTK+ security advisory WSA-2018-0003 lists the following
+     security fixes in the latest versions of WebKitGTK+:
+     + CVE-2018-4101, CVE-2018-4113, CVE-2018-4114, CVE-2018-4117,
+       CVE-2018-4118, CVE-2018-4119, CVE-2018-4120, CVE-2018-4122,
+       CVE-2018-4125, CVE-2018-4127, CVE-2018-4128, CVE-2018-4129,
+       CVE-2018-4133, CVE-2018-4146, CVE-2018-4161, CVE-2018-4162,
+       CVE-2018-4163, CVE-2018-4165 (fixed in 2.20.0).
+   * Update Vcs fields for migration to https://salsa.debian.org/
+   * Enable gstreamer-gl on Ubuntu too (LP: #1752197)
+   * Bump debhelper compat to 10
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 10 Apr 2018 20:34:42 +0200
  
  webkit2gtk (2.20.0-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge