From: Raspbian forward pporter <root@raspbian.org>
Date: Mon, 7 Aug 2017 05:42:48 +0000 (+0100)
Subject: Merge branch 'debpsuedomerge' into buster-working
X-Git-Tag: archive/raspbian/3.22.17-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=653658a257d69d687736d278df117c9aaeeb116c;p=gtk%2B3.0.git

Merge branch 'debpsuedomerge' into buster-working
---

653658a257d69d687736d278df117c9aaeeb116c
diff --cc debian/changelog
index ba667bc908,05205efe9d..f778373c6c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,22 @@@
+ gtk+3.0 (3.22.17-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 26 Jul 2017 18:59:22 +0200
+ 
 +gtk+3.0 (3.22.16-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.
 +
 + -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Jun 2017 02:45:52 +0000
 +
  gtk+3.0 (3.22.16-1) unstable; urgency=medium
  
    * New upstream release.