From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 19 Apr 2018 19:15:23 +0000 (+0100)
Subject: Merge version 3.28.0-1+rpi1 and 3.28.1-1 to produce 3.28.1-1+rpi1
X-Git-Tag: archive/raspbian/3.28.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b5d894504d38e318ae476b963dc12c0139089ce;p=gnome-settings-daemon.git

Merge version 3.28.0-1+rpi1 and 3.28.1-1 to produce 3.28.1-1+rpi1
---

3b5d894504d38e318ae476b963dc12c0139089ce
diff --cc debian/changelog
index 2a57cbc,24664e5..f4d0cc3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- gnome-settings-daemon (3.28.0-1+rpi1) buster-staging; urgency=medium
++gnome-settings-daemon (3.28.1-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.24.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 16:16:39 +0000]
 +  * Hack out wayland support.
 +  [changes introduced in 3.28.0-1+rpi1 by Peter Michael Green]
 +  * Disable wayland in meson_options.txt
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 23 Mar 2018 13:00:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Apr 2018 19:15:23 +0000
++
+ gnome-settings-daemon (3.28.1-1) unstable; urgency=medium
+ 
+   * New upstream release 
+ 
+  -- Tim Lunn <tim@feathertop.org>  Fri, 13 Apr 2018 18:19:32 +1000
  
  gnome-settings-daemon (3.28.0-1) unstable; urgency=medium