From: Raspbian forward pporter Date: Thu, 26 Oct 2017 15:11:38 +0000 (+0100) Subject: Merge version 3.22.24-1+rpi1 and 3.22.24-2 to produce 3.22.24-2+rpi1 X-Git-Tag: archive/raspbian/3.22.24-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=35a8de66680878e3624bf9109f3df9d866248987;p=gtk%2B3.0.git Merge version 3.22.24-1+rpi1 and 3.22.24-2 to produce 3.22.24-2+rpi1 --- 35a8de66680878e3624bf9109f3df9d866248987 diff --cc debian/changelog index 95a02cb407,c87b5f68c2..5cd528aace --- a/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 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, 12 Oct 2017 12:10:43 +0000 ++ -- Raspbian forward porter 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 Mon, 16 Oct 2017 08:26:07 -0400 gtk+3.0 (3.22.24-1) unstable; urgency=low diff --cc debian/patches/series index 9fa33488fe,b07c7011db..7309456108 --- a/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