Manual merge of version 3.22.17-1+rpi1 and 3.22.18-1 to produce 3.22.18-1+rpi1

diff --cc debian/changelog
index 1837fb6f414c38e9eb2f5c8fe77a8aaf1525b098,e2580e2dfebb30813c17fd8368c6287ad142d11c..3bd42a68fb18add3557c8376bdac37075cbbcabe
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,21 +1,34 @@@
- gtk+3.0 (3.22.17-1+rpi1) buster-staging; urgency=medium
- 
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 07 Aug 2017 05:42:50 +0000
- 
- gtk+3.0 (3.22.17-1) unstable; urgency=medium
- 
-   * New upstream release.
- 
-  -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 26 Jul 2017 18:59:22 +0200
- 
- gtk+3.0 (3.22.16-1+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.18-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Sep 2015 01:49:45 +0000]
 +  * Disable wayland backend in debian/rules
 +  * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to
 +    Build-Conflicts
 +  * Add symbols file hack for wayland changes.
 +  * Fix clean target.
 +  [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Jun 2017 02:45:52 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Aug 2017 20:14:39 +0000
++
+ gtk+3.0 (3.22.18-1) unstable; urgency=medium
+ 
+   * Hi from Debconf
+   * New upstream release!
+     + Support entering emoji by name, using Ctrl-Shift-E (note there is a
+       whitelist for this currently - see GtkImContext docs)
+     + Wayland:
+      - Add support for the shortcut inhibitor protocol
+      - Support Wacome tablet wheel scrolling
+   * debian/control{,.in}: Bump wayland-protocols to 1.9, per upstream.
+ 
+  -- Iain Lane <laney@debian.org>  Thu, 10 Aug 2017 16:34:47 +0100
+ 
+ gtk+3.0 (3.22.17-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 26 Jul 2017 18:59:22 +0200
  
  gtk+3.0 (3.22.16-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge