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

diff --cc debian/changelog
index 3616226d158a5985e60aaa3e56c4ad729725653a,505b8835b717a148ace256130e7041e04145e881..1049252205a6a6f32bef7594cfd41a3197b60086
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,33 +1,46 @@@
- gtk+3.0 (3.22.8-1+rpi1) stretch-staging; urgency=medium
++gtk+3.0 (3.22.9-4+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Mar 2017 00:10:48 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 26 Mar 2017 15:13:30 +0000
++
+ gtk+3.0 (3.22.9-4) unstable; urgency=medium
+ 
+   * Force update of GResource files so the changes to the CSS files are
+     actually applied.
+ 
+  -- Michael Biebl <biebl@debian.org>  Tue, 14 Mar 2017 01:38:30 +0100
+ 
+ gtk+3.0 (3.22.9-3) unstable; urgency=medium
+ 
+   * Revert move of .flat from frame > border to frame as it broke existing
+     themes which relied on that behaviour.
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 05 Mar 2017 21:40:15 +0100
+ 
+ gtk+3.0 (3.22.9-2) unstable; urgency=medium
+ 
+   * Team upload
+   * d/p/wayland-make-sure-to-clear-up-the-number-of-keys.patch:
+     Add patch from upstream fixing unintended key repeats on Wayland
+     (Closes: #856478)
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 01 Mar 2017 15:50:14 +0000
+ 
+ gtk+3.0 (3.22.9-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop debian/patches/032_mips_treeview_row_separator_height.patch, no
+     longer needed.
+ 
+  -- Michael Biebl <biebl@debian.org>  Tue, 28 Feb 2017 18:48:39 +0100
  
  gtk+3.0 (3.22.8-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index e7a6614f2c6390a0b3a8bf5193312d4416d399d3,4762c321c806df9bda159d9da3f07508564e6595..1d50d27a1d717aae2d39715c51d4edf62464193c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -162,11 -162,12 +162,15 @@@ 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
 +      sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols
 +      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
  
  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