Manual merge of version 2.22.0-2+rpi1 and 2.22.2-1 to produce 2.22.2-1+rpi1

diff --cc debian/changelog
index cad0db83f2f1ca900fd6b1fb4be9d3e233a3a3b1,4fe4cfdcbb727a3f640fe1c6952e537ce3adc6f1..7d876c2c874ed164fbb07a54184c7b4cc9e3a0f8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,25 +1,33 @@@
- webkit2gtk (2.22.0-2+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.22.2-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>  Fri, 21 Sep 2018 01:38:20 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 27 Sep 2018 14:41:02 +0000
++
+ webkit2gtk (2.22.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/upstream/signing-key.asc:
+     + Add Adrian Perez's GPG key to the keyring. He'll also be in charge
+       of making upstream releases.
+   * debian/patches/fix-ftbfs-x32.patch:
+     + Fix the X32 build.
+   * debian/patches/fix-ftbfs-armel.patch:
+     + Fix the armel build.
+     + debian/rules:
+       - Stop passing -DENABLE_JIT=OFF manually.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Sat, 22 Sep 2018 00:31:55 +0300
+ 
+ webkit2gtk (2.22.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/patches/replace-stdmax.patch:
+     + Drop patch, this has been merged upstream.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 20 Sep 2018 11:55:58 +0300
  
  webkit2gtk (2.22.0-2) unstable; urgency=medium