Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index ba667bc9086e9945bf7efd44a30fd57a4408c7e5,05205efe9de377303e71ebc4eb411c45c85102ae..f778373c6c1d191a45b0589364c8438dd879f745
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,22 @@@
+ 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
 +
 +  [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
 +
  gtk+3.0 (3.22.16-1) unstable; urgency=medium
  
    * New upstream release.

diff --cc debian/control
Simple merge