Manual merge of version 3.22.9-4+rpi1 and 3.22.11-1 to produce 3.22.11-1+rpi1

diff --cc debian/changelog
index 1049252205a6a6f32bef7594cfd41a3197b60086,9c01a6feab77816b60aa48942048dfb7c3bfdb48..257d8a895a2bcda047a94c047499fdf6578c12a8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- gtk+3.0 (3.22.9-4+rpi1) stretch-staging; urgency=medium
++gtk+3.0 (3.22.11-1+rpi1) stretch-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 26 Mar 2017 15:13:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Apr 2017 03:45:05 +0000
++
+ gtk+3.0 (3.22.11-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches which have been merged upstream.
+ 
+  -- Michael Biebl <biebl@debian.org>  Fri, 24 Mar 2017 02:27:48 +0100
  
  gtk+3.0 (3.22.9-4) unstable; urgency=medium
  

diff --cc debian/rules
index 1d50d27a1d717aae2d39715c51d4edf62464193c,6ba7a4c78149a358f3531a5c308b5c1129123e3e..e7a6614f2c6390a0b3a8bf5193312d4416d399d3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -162,15 -162,8 +162,11 @@@ clean:: debian/contro
        rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
        rm -f testsuite/reftests/*.ui.known_fail
        rm -rf debian/build debian/install
-       # The build system does not automatically update the GResource files
-       # when resources change. Force an update since we modify CSS files in
-       # Revert-move-of-.flat-from-frame-border-to-frame.patch.
-       rm -f gtk/gtkresources.c gtk/gtkresources.h
 +      sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols
 +      rm -rf debian/build debian/install
  
  pre-build::
 +      sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols
        # Mark reftests with known failures as non-fatal
        touch testsuite/reftests/nonresizable-size.ui.known_fail
        touch testsuite/reftests/window-show-contents-on-map.ui.known_fail