Merge version 3.22.29-2+rpi1 and 3.22.29-3 to produce 3.22.29-3+rpi1

diff --cc debian/changelog
index b7e24fb44d88321b0e9313de7c24a6c63291739c,18ba9c23d7796e5c1578a33aa35ed8ee1bd7a688..858f54b0e7284e7d3609c5d2f57ddaa8c742a614
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,19 +1,32 @@@
- gtk+3.0 (3.22.29-2+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.29-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>  Wed, 28 Mar 2018 23:09:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 01:31:39 +0000
++
+ gtk+3.0 (3.22.29-3) unstable; urgency=medium
+ 
+   * Team upload
+   * Allow stderr in autopkgtests. They produce harmless diagnostics.
+   * d/p/0013-wayland-Drop-cairo-surfaces-when-withdrawing.patch:
+     Add patch from upstream fixing a Wayland client crash if it unmaps
+     a window while gdk is processing updates
+   * d/p/0014-AM_PATH_GTK_3_0-Use-AC_PATH_TOOL-to-find-pkg-config.patch,
+     d/p/0015-m4macros-Fix-underquoting-in-AC_PATH_TOOL.patch:
+     Use AC_PATH_TOOL to find pkg-config in the deprecated AM_PATH_GTK_3_0
+     macro (Closes: #894069)
+   * d/p/0016-imwayland-destroy-objects-only-if-it-matches-our-man.patch:
+     Add patch proposed upstream to fix crashes on screen blank in some
+     dual-monitor configurations (Closes: #894388)
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 03 Apr 2018 08:41:09 +0100
  
  gtk+3.0 (3.22.29-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7b5a1e9cc8ac602c33b27445f4dd24af03139851,556cc36e1964009cea0d16fb31daf5a097dc8aec..557198940b149d8089d9258006d1564036464a16
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -10,4 -10,7 +10,8 @@@ gdk-x11-Check-if-we-have-access-to-GL-b
  0010-imwayland-Avoid-TOGGLE_INPUT_PANEL-requests-if-there.patch
  0011-gtkstylecontext-guard-against-gtk_css_widget_node_ge.patch
  0012-widget-Only-print-allocation-warnings-with-enable-de.patch
+ 0013-wayland-Drop-cairo-surfaces-when-withdrawing.patch
+ 0014-AM_PATH_GTK_3_0-Use-AC_PATH_TOOL-to-find-pkg-config.patch
+ 0015-m4macros-Fix-underquoting-in-AC_PATH_TOOL.patch
+ 0016-imwayland-destroy-objects-only-if-it-matches-our-man.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248