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

diff --cc debian/changelog
index 858f54b0e7284e7d3609c5d2f57ddaa8c742a614,3774b82aa42f78abb5d1287c3c07b74318712cd9..6b6e60837a37c0f040dc60354ef6560731a1da5f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,31 +1,44 @@@
- gtk+3.0 (3.22.29-3+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.30-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>  Mon, 09 Apr 2018 01:31:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 04 Jul 2018 03:09:05 +0000
++
+ gtk+3.0 (3.22.30-2) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Jeremy Bicha ]
+   * Bump minimum wayland-protocols to 1.12
+ 
+   [ Simon McVittie ]
+   * d/p/m4macros-Set-a-serial-number.patch:
+     Add patch from upstream to give gtk-3.0.m4 a serial number so that
+     it will override older copies bundled with other packages, typically
+     in the m4 directory (GTK+ 3 version of #895018)
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 27 Jun 2018 09:55:28 +0100
+ 
+ gtk+3.0 (3.22.30-1) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * New upstream release
+   * Drop patches applied in new release (numbered 0009-0016)
+ 
+   [ Simon McVittie ]
+   * d/p/022_disable-viqr-im-for-vi-locale.patch:
+     Add reference to Ubuntu bug 191451, summarize the reason why this
+     is applied, and correctly attribute the patch to Ming Hua
+     (see #895043)
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Mon, 16 Apr 2018 19:55:32 -0400
  
  gtk+3.0 (3.22.29-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
index cc20a8bb73ccae2091db762ad582d6cc69407b92,8cabcff7ed5498925016f924e9b867b3ae1127e9..63c8e3dc7e10b5ab4d18d4dd779110141956bfac
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -131,10 -131,10 +131,10 @@@ Section: libdeve
  Architecture: any
  Multi-Arch: same
  Depends: @SHARED_PKG@ (= ${binary:Version}),
--         gir1.2-gtk-3.0 (= ${binary:Version}),
           @COMMON_PKG@,
           ${misc:Depends},
           ${shlibs:Depends},
++         gir1.2-gtk-3.0 (= ${binary:Version}),
           libglib2.0-dev (>= 2.49.4),
           libgdk-pixbuf2.0-dev (>= 2.30.0),
           libpango1.0-dev (>= 1.40.5),

diff --cc debian/patches/series
index 557198940b149d8089d9258006d1564036464a16,82e733395f6b64213b6c28747a86f0691e62a283..cb3233262cee2932e52b4446740e91b37fc6e112
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -6,12 -7,3 +7,4 @@@ m4macros-Set-a-serial-number.patc
  no-accessibility-dump.patch
  reftest-known-fail.patch
  gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
- 0009-gtkimmodule-make-match_backend-query-the-wayland-reg.patch
- 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