Merge version 3.24.3-1+rpi1 and 3.26.2-1 to produce 3.26.2-1+rpi1

diff --cc debian/changelog
index fce662b5c6c1f0377a5ae2323b4074acc5b8662f,7e6add7b0d5635141e717fb005d724a51378c6f4..55467c2402dc584d1fada7183e1146759a06321b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,62 +1,69 @@@
- gnome-settings-daemon (3.24.3-1+rpi1) buster-staging; urgency=medium
++gnome-settings-daemon (3.26.2-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 17 Aug 2017 16:16:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Nov 2017 02:34:37 +0000
++
+ gnome-settings-daemon (3.26.2-1) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * New upstream release
+   * Switch to dh_missing
+ 
+   [ Helmut Grohne ]
+   * Honour DEB_BUILD_OPTIONS=nocheck (Closes: #880486)
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 02 Nov 2017 18:45:01 +0100
+ 
+ gnome-settings-daemon (3.26.1-2) unstable; urgency=medium
+ 
+   * Release to unstable
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 17:06:30 -0400
+ 
+ gnome-settings-daemon (3.26.1-1) experimental; urgency=medium
+ 
+   * New upstream release
+     - Fix a regression in HiDPI support for Xorg session (LP: #1720150)
+   * Bump Standards-Version to 4.1.1
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Tue, 03 Oct 2017 10:18:58 -0400
+ 
+ gnome-settings-daemon (3.26.0-1) experimental; urgency=medium
+ 
+   * Team upload
+   * debian/watch: Only watch for stable versions again
+   * New upstream stable release
+ 
+  -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:41:21 +0100
+ 
+ gnome-settings-daemon (3.25.92-1) experimental; urgency=medium
+ 
+   * Team upload
+   * New upstream release
+ 
+   [ Laurent Bigonville ]
+   * debian/rules: Make tests failures fatal on s390x again, the tests were
+     failing because hwdb files included in udev package were not installed,
+     adding a build-dependency against udev fixed the failure.
+ 
+   [ Jeremy Bicha ]
+   * Orientation and xrandr plugins have been moved to mutter
+     - Bump Breaks for gnome-session that shipped files with those plugins
+       as RequiredComponents
+   * debian/gnome-settings-daemon.maintscript:
+     - Remove obsolete autostart files for Orientation and XRANDR plugins
+ 
+   [ Simon McVittie ]
+   * debian/watch: Watch for development versions
+   * Bump GLib build-dependency
+   * Do not try to install usr/share/icons, no longer provided
+   * Add Breaks on pre-3.25 GNOME Shell and GNOME Control Center for
+     lockstep upgrade, since functionality has moved around
+   * d/p/04_superP.patch: Drop, this functionality is no longer in g-s-d
+ 
+  -- Simon McVittie <smcv@debian.org>  Thu, 07 Sep 2017 11:59:05 +0100
  
  gnome-settings-daemon (3.24.3-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8b9008efb3b98eb7832869734c546588d5bc658a,0000000000000000000000000000000000000000..14a39c912f2271cf9de1e4e32c9e57436f84f351
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 04_superP.patch
 +hack-out-wayland.patch

diff --cc plugins/common/gsd-device-manager-udev.c
Simple merge