From: Raspbian forward pporter Date: Wed, 28 Mar 2018 23:09:12 +0000 (+0100) Subject: Merge version 3.22.29-1+rpi1 and 3.22.29-2 to produce 3.22.29-2+rpi1 X-Git-Tag: archive/raspbian/3.22.29-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea5cc1de16fd38316ff89682c9af94771371e88d;p=gtk%2B3.0.git Merge version 3.22.29-1+rpi1 and 3.22.29-2 to produce 3.22.29-2+rpi1 --- bdde8ea1ea01c3c7174f968e0f97491253aba463 diff --cc debian/changelog index b100075132,6675e54b30..b7e24fb44d --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,21 +1,34 @@@ - gtk+3.0 (3.22.29-1+rpi1) buster-staging; urgency=medium ++gtk+3.0 (3.22.29-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green 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 Thu, 22 Mar 2018 22:26:09 +0000 ++ -- Raspbian forward porter Wed, 28 Mar 2018 23:09:12 +0000 ++ + gtk+3.0 (3.22.29-2) unstable; urgency=medium + + * Team upload + * Refresh patch series through gbp-pq + - Harvest date and authorship information from debian/changelog + * Add more upstream status information to the patch series + * d/p/0009-gtkimmodule-make-match_backend-query-the-wayland-reg.patch, + d/p/0010-imwayland-Avoid-TOGGLE_INPUT_PANEL-requests-if-there.patch: + Add patches from upstream fixing Wayland client crashes under + unspecified circumstances (Closes: #893696) + * d/p/0011-gtkstylecontext-guard-against-gtk_css_widget_node_ge.patch: + Add patch from upstream fixing a NULL dereference + * d/p/0012-widget-Only-print-allocation-warnings-with-enable-de.patch: + Add patch from upstream silencing allocation warnings for stable + branches (if there is ever a GTK+ 3.23 then these warnings would + come back until 3.24). (Closes: #867427) + + -- Simon McVittie Thu, 22 Mar 2018 10:15:24 +0000 gtk+3.0 (3.22.29-1) unstable; urgency=medium diff --cc debian/patches/series index 2d0b2e6bc0,99982236af..7b5a1e9cc8 --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,4 -6,7 +6,8 @@@ 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 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248