From: Raspbian forward pporter Date: Wed, 27 Dec 2017 21:47:16 +0000 (+0000) Subject: Merge version 3.22.24-3+rpi1 and 3.22.26-2 to produce 3.22.26-2+rpi1 X-Git-Tag: archive/raspbian/3.22.26-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84472a14f1558e27e5648232a9a790fd3702f75a;p=gtk%2B3.0.git Merge version 3.22.24-3+rpi1 and 3.22.26-2 to produce 3.22.26-2+rpi1 --- 84472a14f1558e27e5648232a9a790fd3702f75a diff --cc debian/changelog index fa7ccbccdb,ae42de2fe4..4d3b626e36 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,48 +1,61 @@@ - gtk+3.0 (3.22.24-3+rpi1) buster-staging; urgency=medium ++gtk+3.0 (3.22.26-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. + - -- Peter Michael Green Thu, 16 Nov 2017 17:21:06 +0000 ++ -- Raspbian forward porter Wed, 27 Dec 2017 21:47:16 +0000 ++ + gtk+3.0 (3.22.26-2) unstable; urgency=medium + + [ Simon McVittie ] + * Set Rules-Requires-Root to no + * Add a Lintian override to silence warnings about the non-standard + name of libgail-3-0, which should really have been libgailutil-3-0 + but isn't going to be changed now + + [ Jeremy Bicha ] + * Add git_text-view-support-emoji-chooser.patch: + - Offer right-click "Insert Emoji" menu item for GtkTextView too + + -- Jeremy Bicha Tue, 28 Nov 2017 17:16:13 -0500 + + gtk+3.0 (3.22.26-1) unstable; urgency=medium + + [ Simon McVittie ] + * Move examples, udebs from Priority: extra to optional + + [ Michael Biebl ] + * New upstream release + * Rebase patches + * Update symbols file for libgtk-3-0 + * Bump Standards-Version to 4.1.1 + * Drop no longer needed Breaks/Replaces + * Add (versioned) Provides to gir1.2-gtk-3.0 to follow the latest changes in + the GObject introspection policy wrt bundled typelibs. + + -- Michael Biebl Mon, 13 Nov 2017 00:54:47 +0100 + + gtk+3.0 (3.22.25-1) unstable; urgency=medium + + * Team upload + * New upstream release + - Fix tiling behaviour with Mutter/Shell 3.26 (Closes: #879566) + - Update symbols file + - d/p/0001-Adwaita-Fix-typo-.backgrounf-.background.patch, + d/p/0002-theme-Fix-Adwaita-headerbars.patch, + d/p/0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch: + Drop patches, applied upstream + - d/p/gdk-wayland-protocol-server-decoration.patch: + Add server-decoration.xml from upstream git. It is missing from the + tarball release. + + -- Simon McVittie Sun, 29 Oct 2017 17:21:51 +0000 gtk+3.0 (3.22.24-3) unstable; urgency=medium diff --cc debian/patches/series index 9fa33488fe,454beb0336..665b91f0c9 --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,7 -6,4 +6,5 @@@ no-accessibility-dump.patch reftest-known-fail.patch gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch - 0001-Adwaita-Fix-typo-.backgrounf-.background.patch - 0002-theme-Fix-Adwaita-headerbars.patch - 0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch + git_text-view-support-emoji-chooser.patch +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 diff --cc debian/rules index ebb0e94cef,791bd0d232..2adfd2ef43 --- a/debian/rules +++ b/debian/rules @@@ -140,11 -140,9 +140,11 @@@ 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 + # when resources change. Force an update in case we ship a patch which + # modifies the theme CSS files. rm -f gtk/gtkresources.c gtk/gtkresources.h dh_clean @@@ -152,10 -150,9 +152,10 @@@ override_dh_auto_build: $(call dh_subst_files,$(binaries)) override_dh_autoreconf: - dh_autoreconf "NOCONFIGURE=true ./autogen.sh" + NOCONFIGURE=true dh_autoreconf ./autogen.sh override_dh_auto_configure: debian/control + sed -i s/arch=linux-any/optional=nowayland/ debian/libgtk-3-0.symbols dh_auto_configure \ --builddirectory=debian/build/deb \ -- \