Merge version 3.22.30-2+rpi1 and 3.24.0-3 to produce 3.24.0-3+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Sat, 22 Sep 2018 20:47:40 +0000 (21:47 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Sat, 22 Sep 2018 20:47:40 +0000 (21:47 +0100)
1  2 
debian/changelog
debian/control
debian/control.in
debian/patches/series
debian/rules

index 6b6e60837a37c0f040dc60354ef6560731a1da5f,3ff362c47f41a47859830b9f73c8e704dcaabf0b..01a5e0881b55df5788d08b84f0c3d6a3d29796dd
- gtk+3.0 (3.22.30-2+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.24.0-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, 04 Jul 2018 03:09:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 22 Sep 2018 20:47:39 +0000
++
+ gtk+3.0 (3.24.0-3) unstable; urgency=medium
+   * Cherry-pick 3c7d5e7 to fix a critical on gtk_application_shutdown when not
+     using portals (Closes: #908070)
+   * Add Applied-Upstream to last cherry-pick
+   * Fix-portal-path-handling.patch: Cherry-pick from upstream.  Fix an
+     incorrect dereference in the portal handling code.
+  -- Iain Lane <laney@debian.org>  Tue, 11 Sep 2018 17:33:38 +0100
+ gtk+3.0 (3.24.0-2) unstable; urgency=medium
+   * Team upload
+   * d/p/Revert-imwayland-clear-preedit-on-focus-out.patch:
+     Revert an upstream change that caused the cursor to disappear on
+     focus changes in vte terminals like gnome-terminal and lxterminal
+     under Wayland (Closes: #908120)
+   * debian/libgtk-3-0.symbols: gtk_color_picker_kwin_new() is new in
+     3.24.0, not 3.24.3 which doesn't exist yet
+   * d/p/Don-t-test-default-constructed-GdkPixbuf-properties.patch:
+     Work around a gdk-pixbuf bug that caused test failures
+     (Closes: #908439)
+   * d/gbp.conf: Don't number patches
+  -- Simon McVittie <smcv@debian.org>  Mon, 10 Sep 2018 01:15:53 +0100
+ gtk+3.0 (3.24.0-1) unstable; urgency=medium
+   [ Simon McVittie ]
+   * debian/libgtk-3-0.bug-control:
+     When bugs are reported against GTK+, include details of various
+     engines, modules and LD_PRELOADs if installed
+   * Don't install ChangeLog, which currently just says
+     "A git checkout and git-log is required to generate this file";
+     even if it was complete, Policy 4.2.0 does not require detailed
+     changelogs to be installed. Please see NEWS for a summary of changes,
+     or the upstream git repository https://gitlab.gnome.org/GNOME/gtk
+     for a comprehensive change history.
+   [ Iain Lane ]
+   * Revert "debian/{control{,.in},gbp.conf,watch}: Update for experimental"
+     This reverts commit 99b78e089c952661fcf3c4897769dd7a463c5cb7.
+   * New upstream stable release 3.24.0
+     + GtkApplication can now track screensaver state
+     + Deprecate a few APIs that are gone in GTK+ 4:
+        - focus chains in GtkContainer
+        - stepper sensitivity in GtkRange
+     + Allow picking colors under kwin
+   * debian/control{,.in}: Bump Standards-Version to 4.2.1, no changes required
+   * debian/libgtk-3-0.symbols: Update for this release
+  -- Iain Lane <laney@debian.org>  Tue, 04 Sep 2018 18:10:53 +0100
+ gtk+3.0 (3.23.2-1) experimental; urgency=medium
+   [ Andrea Azzarone ]
+   * New upstream release
+   * debian/patches/0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch:
+     Drop, included in this release.
+   * debian/libgtk-3-0.symbols: New symbols for this release
+   [ Iain Lane ]
+   * Stanrdards-Version → 4.2.0 - no changes required.
+  -- Andrea Azzarone <andrea.azzarone@canonical.com>  Thu, 09 Aug 2018 14:11:12 +0000
+ gtk+3.0 (3.23.1-1) experimental; urgency=medium
+   * debian/{control{,.in},gbp.conf,watch}: Update for experimental
+   * New upstream development releases (!!!) 3.23.0 & 3.23.1:
+     + New font chooser features:
+      - Allow setting OpenType font features
+      - Show examples for OpenType font features
+      - Allow selecting OpenType font variations
+      - Support levels of details for selection
+     + New Emoji features:
+      - Support a completion popup for Emoji
+      - Drop Ctrl-Shift-e shortcut
+     + Other new apis:
+      - gdk_window_move_to_rect
+     + Backported event controllers from GTK+ 4:
+      - GtkEventControllerScroll
+      - GtkEventControllerMotion
+      - GtkEventControllerKey
+      - GtkGestureStylus
+     + Support markup in GtkModelButtons
+     + Themes
+      - The Raleigh theme has been removed
+      - Expander size in HighContrast has been increased
+     + Wayland
+      - Update cursor scale when needed
+      - Decoration negotiation protocol fixes
+   * debian/patches/m4macros-Set-a-serial-number.patch: Drop, included in this
+     release.
+   * debian/control{,.in}: Bump libepoxy (1.4) and pango (1.41.0) per upstream.
+   * debian/patches/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch:
+     Drop - GTK now calls epoxy_has_glx() directly so this bypassed approach
+     isn't necessary.
+   * debian/libgail-3-0.symbols: New symbols from both releases.
+   * debian/patches/0008-defaultvalue-Ignore-more-style-properties-that-Adwai.patch:
+     Cherry-pick test fix patch from upstream !253.
+  -- Iain Lane <laney@debian.org>  Thu, 19 Jul 2018 17:55:42 +0100
  
  gtk+3.0 (3.22.30-2) unstable; urgency=medium
  
diff --cc debian/control
index 3b6621f03b4a2bb558cccf73ccfd561218ebb56b,c9525f8dd9651e86a5c9542b1dade95316dd6735..ea0d61165f781e017d62b34c144669f9c2ea421e
@@@ -13,12 -13,15 +13,12 @@@ Build-Depends: debhelper (>= 10.3~)
                 at-spi2-core <!nocheck>,
                 libglib2.0-dev (>= 2.49.4),
                 libgdk-pixbuf2.0-dev (>= 2.30.0),
-                libpango1.0-dev (>= 1.40.5),
+                libpango1.0-dev (>= 1.41.0),
                 libatk1.0-dev (>= 2.15.1),
                 libatk-bridge2.0-dev,
-                libepoxy-dev,
 -               libegl1-mesa-dev [linux-any],
+                libepoxy-dev (>= 1.4),
                 libfontconfig1-dev,
                 libharfbuzz-dev (>= 0.9),
 -               libwayland-dev (>= 1.9.91) [linux-any],
 -               wayland-protocols (>= 1.12) [linux-any],
                 libxkbcommon-dev (>= 0.2.0),
                 libx11-dev,
                 libxext-dev,
index 63c8e3dc7e10b5ab4d18d4dd779110141956bfac,cc32c917960e3f154d50829954eb945826bfb236..7d210a0bf14a31d2f096713be51a05050a685a78
@@@ -13,12 -13,15 +13,12 @@@ Build-Depends: debhelper (>= 10.3~)
                 at-spi2-core <!nocheck>,
                 libglib2.0-dev (>= 2.49.4),
                 libgdk-pixbuf2.0-dev (>= 2.30.0),
-                libpango1.0-dev (>= 1.40.5),
+                libpango1.0-dev (>= 1.41.0),
                 libatk1.0-dev (>= 2.15.1),
                 libatk-bridge2.0-dev,
-                libepoxy-dev,
 -               libegl1-mesa-dev [linux-any],
+                libepoxy-dev (>= 1.4),
                 libfontconfig1-dev,
                 libharfbuzz-dev (>= 0.9),
 -               libwayland-dev (>= 1.9.91) [linux-any],
 -               wayland-protocols (>= 1.12) [linux-any],
                 libxkbcommon-dev (>= 0.2.0),
                 libx11-dev,
                 libxext-dev,
@@@ -134,10 -134,10 +134,10 @@@ Depends: @SHARED_PKG@ (= ${binary:Versi
           @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),
+          libpango1.0-dev (>= 1.41),
           libatk1.0-dev (>= 2.15.1),
           libatk-bridge2.0-dev,
           libcairo2-dev (>= 1.14.0),
index cb3233262cee2932e52b4446740e91b37fc6e112,d556d8bd79cb098e29cbc5c086b3f44cda87744e..2b57511c7205d80990fd8352134552ed5ac08a65
@@@ -6,5 -7,5 +7,6 @@@ Fix-portal-path-handling.patc
  060_ignore-random-icons.patch
  no-accessibility-dump.patch
  reftest-known-fail.patch
- gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
+ Revert-imwayland-clear-preedit-on-focus-out.patch
+ Don-t-test-default-constructed-GdkPixbuf-properties.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248
diff --cc debian/rules
Simple merge