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

diff --cc debian/changelog
index 95a02cb407e51867fa5ab6068dfa66de9e1fe63f,c87b5f68c24217ce98926858beadc6033181958d..5cd528aace37920b3ffec329e1454ce30f426514
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,27 @@@
- gtk+3.0 (3.22.24-1+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.24-2+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, 12 Oct 2017 12:10:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Oct 2017 15:11:37 +0000
++
+ gtk+3.0 (3.22.24-2) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Add 0004_fix-gtkentry-wayland-regression.patch:
+     - Cherry-pick fix for lag with Epiphany's address bar (Closes: #875826)
+ 
+   [ Michael Biebl ]
+   * Switch from XC-Package-Type to Package-Type which is an official field
+     name since dpkg-dev 1.15.7.
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Mon, 16 Oct 2017 08:26:07 -0400
  
  gtk+3.0 (3.22.24-1) unstable; urgency=low
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge

diff --cc debian/patches/series
index 9fa33488fe4a58e84bc50699e6fd6d5835ba2b02,b07c7011db4bf1f53ce42f8fe41ea6e0a1d13ed7..730945610882b73fe8d03c8f6c154dc786ad0e75
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -9,4 -9,4 +9,5 @@@ gdk-x11-Check-if-we-have-access-to-GL-b
  0001-Adwaita-Fix-typo-.backgrounf-.background.patch
  0002-theme-Fix-Adwaita-headerbars.patch
  0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch
+ 0004-fix-gtkentry-wayland-regression.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248