Manual merge of version 3.22.24-1+rpi1 and 3.22.24-3 to produce 3.22.24-3+rpi1

diff --cc debian/changelog
index 95a02cb407e51867fa5ab6068dfa66de9e1fe63f,2ae714403f808e030ac0664fbe1566f02ce5cac3..fa7ccbccdb7667a07e9e10ab933ddae40feafd1a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,40 @@@
- gtk+3.0 (3.22.24-1+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.24-3+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
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 16 Nov 2017 17:21:06 +0000
++
+ gtk+3.0 (3.22.24-3) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Drop 0004_fix-gtkentry-wayland-regression.patch:
+     - Reverted upstream since it caused a totem regression. Epiphany
+       issue was fixed in mutter instead.
+ 
+   [ Michael Biebl ]
+   * Force update of GResource files so the changes to the CSS files from
+     0002-theme-Fix-Adwaita-headerbars.patch are actually applied.
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 22 Oct 2017 13:22:16 +0200
+ 
+ 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/rules
index 2f22c39e08ff380f8cdf16401e52a5d6a37076dc,09b07fd44e8d424630e9569a57d0fa4974cc4624..ebb0e94cef447f211e14d1ecc0ddc88c6dd6579c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -140,8 -140,10 +140,12 @@@ override_dh_clean: debian/contro
        rm -f $(call dh_subst_files,$(binaries))
        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
+       # 0002-theme-Fix-Adwaita-headerbars.patch
+       rm -f gtk/gtkresources.c gtk/gtkresources.h
        dh_clean
  
  # Add dependencies to generate files from the debian/*.in ones