From: Raspbian forward pporter <root@raspbian.org>
Date: Mon, 4 Sep 2017 19:26:47 +0000 (+0100)
Subject: Merge version 3.22.18-1+rpi1 and 3.22.19-1 to produce 3.22.19-1+rpi1
X-Git-Tag: archive/raspbian/3.22.19-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b69ca801b17d0e8a563916241f7a87f092ee977;p=gtk%2B3.0.git

Merge version 3.22.18-1+rpi1 and 3.22.19-1 to produce 3.22.19-1+rpi1
---

c696400b88164b95a4470e31d8f5e7cdaed9e509
diff --cc debian/changelog
index 3bd42a68fb,894c7327eb..470c66e0a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,18 +1,31 @@@
- gtk+3.0 (3.22.18-1+rpi1) buster-staging; urgency=medium
++gtk+3.0 (3.22.19-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Aug 2017 20:14:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Sep 2017 19:26:46 +0000
++
+ gtk+3.0 (3.22.19-1) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * New upstream release
+   * debian/libgtk-3-common.install.in:
+     Install EmojiChooser gsettings schemas
+   * Add fix-gtk-menu-sliders.patch:
+     - Cherry-pick patch to fix regression with clicking on sliders in menus,
+       such as with Unity's sound indicator (LP: #1712701) (Closes: #872687)
+ 
+   [ Ken VanDine ]
+   * debian/control.in:
+     - Bump libpango1.0-dev Build-Depends to >= 1.40.5 for colornames test
+ 
+  -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 28 Aug 2017 20:39:28 -0400
  
  gtk+3.0 (3.22.18-1) unstable; urgency=medium
  
diff --cc debian/control
index 7e4d0f9822,676680921f..8b7e432806
--- a/debian/control
+++ b/debian/control
@@@ -19,9 -19,10 +19,9 @@@ Build-Depends: debhelper (>= 9.20141010
                 at-spi2-core <!nocheck>,
                 libglib2.0-dev (>= 2.49.4),
                 libgdk-pixbuf2.0-dev (>= 2.30.0),
-                libpango1.0-dev (>= 1.37.3),
+                libpango1.0-dev (>= 1.40.5),
                 libatk1.0-dev (>= 2.15.1),
                 libatk-bridge2.0-dev,
 -               libegl1-mesa-dev [linux-any],
                 libepoxy-dev,
                 libfontconfig1-dev,
                 libharfbuzz-dev (>= 0.9),
diff --cc debian/control.in
index 4f4756a719,66e2917763..b6f013ffaa
--- a/debian/control.in
+++ b/debian/control.in
@@@ -19,9 -19,10 +19,9 @@@ Build-Depends: debhelper (>= 9.20141010
                 at-spi2-core <!nocheck>,
                 libglib2.0-dev (>= 2.49.4),
                 libgdk-pixbuf2.0-dev (>= 2.30.0),
-                libpango1.0-dev (>= 1.37.3),
+                libpango1.0-dev (>= 1.40.5),
                 libatk1.0-dev (>= 2.15.1),
                 libatk-bridge2.0-dev,
 -               libegl1-mesa-dev [linux-any],
                 libepoxy-dev,
                 libfontconfig1-dev,
                 libharfbuzz-dev (>= 0.9),
diff --cc debian/patches/series
index 2d0b2e6bc0,5b44732aa3..5a5681c3e9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -6,4 -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
+ fix-gtk-menu-sliders.patch
 +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248