Merge version 3.22.21-1+rpi1 and 3.22.24-1 to produce 3.22.24-1+rpi1

diff --cc debian/changelog
index 51d6b8eed71bac5f3c5e822044d20b7c13d270b5,80437d873ee685a273dacf796ed295414252bcfd..95a02cb407e51867fa5ab6068dfa66de9e1fe63f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,19 +1,32 @@@
- gtk+3.0 (3.22.21-1+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.24-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Sep 2017 01:13:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2017 12:10:43 +0000
++
+ gtk+3.0 (3.22.24-1) unstable; urgency=low
+ 
+   * New upstream release (LP: #1712011, #1719047)
+   * Cherry-pick fixes committed after the 3.22.24 release:
+     - 0001-Adwaita-Fix-typo-.backgrounf-.background.patch
+     - 0002-theme-Fix-Adwaita-headerbars.patch
+     - 0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Wed, 04 Oct 2017 19:07:15 -0400
+ 
+ gtk+3.0 (3.22.22-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/copyright: Mark Scheme Widget Library as SWL rather than 'other'.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 03 Oct 2017 20:02:52 +0200
  
  gtk+3.0 (3.22.21-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 2d0b2e6bc0fff2c16b48ca899edcdb2d2d691acd,7c90b19799aabde95668d6ad7ff4db422a1541f2..9fa33488fe4a58e84bc50699e6fd6d5835ba2b02
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -6,4 -6,6 +6,7 @@@
  no-accessibility-dump.patch
  reftest-known-fail.patch
  gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
+ 0001-Adwaita-Fix-typo-.backgrounf-.background.patch
+ 0002-theme-Fix-Adwaita-headerbars.patch
+ 0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248