Merge version 3.28.3-1+rpi1 and 3.28.3-2 to produce 3.28.3-2+rpi1

diff --cc debian/changelog
index 69f6f7036268fc1ef24ffeca077a04187aed6a91,ef3a62519f04d010bceb9b33858763ee0e448b63..2c1fba48ede4feae5a83e83ef51c8a5c14b9dde7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,38 +1,48 @@@
- mutter (3.28.3-1+rpi1) buster-staging; urgency=medium
++mutter (3.28.3-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.28.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 04 Apr 2018 10:10:12 +0000]
 +  * Add build-depends on libmtdev-dev.
 +  * Disable parallel building.
 +  [changes introduced in 3.28.1-1+rpi1 by Peter Michael Green]
 +  * Add build-depends on libgles2-mesa-dev
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jul 2018 12:28:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 14:06:28 +0000
++
+ mutter (3.28.3-2) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Iain Lane ]
+   * debian/gbp.conf: Set the upstream branch to upstream/3.28.x, since we've
+     branched for experimental now.
+ 
+   [ Marco Trevisan (Treviño) ]
+   * d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch:
+     - Avoid crashing when warning about wrongly set crtc mode
+       (LP: #1754949)
+   * d/p/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch:
+     - Don't crash if drmModeGetResources returns NULL  (LP: #1767956)
+   * d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch:
+     - Always update monitor in wayland, avoiding crash (LP: #1784398)
+   * d/p/monitor-manager-Filter-out-low-screen-resolutions.patch:
+     - Don't return screen resolutions that can't be applied (LP: #1772831)
+   * d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch,
+     d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch:
+     - Don't crash if a modal dialog closes while being dragged
+       (LP: #1422253)
+   * d/p/monitor-Use-current-monitor-mode-to-check-whether-active.patch:
+     - Don't try to use an invalid monitor mode to figure out scaling
+       (LP: #1723615)
+ 
+   [ Simon McVittie ]
+   * Sort patch series in upstream order, with patches applied upstream
+     first
+   * d/copyright: Remove obsolete FSF postal addresses
+   * Standards-Version: 4.1.5 (no changes required)
+   * Set Rules-Requires-Root to no
+   * Update symbols file
+ 
+  -- Simon McVittie <smcv@debian.org>  Tue, 31 Jul 2018 15:35:03 +0100
  
  mutter (3.28.3-1) unstable; urgency=medium
  

diff --cc debian/control
index 291409fcd7e06514ce7f255c18945f97130b38ad,5e7c8e2ebeac0b1a6e4e4b016101e93cc7553f15..7b5bf14fb713b5bb3a79120b1b5f58bbc8a18bbb
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -56,10 -56,9 +56,11 @@@ Build-Depends: debhelper (>= 11)
                 xkb-data,
                 xvfb <!nocheck>,
                 xauth <!nocheck>,
 -               zenity
 +               zenity,
 +               libmtdev-dev,
 +               libgles2-mesa-dev
- Standards-Version: 4.1.4
+ Rules-Requires-Root: no
+ Standards-Version: 4.1.5
  Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
  Vcs-Browser: https://salsa.debian.org/gnome-team/mutter
  

diff --cc debian/control.in
index 054a6ab8824c063219a9e4dac11b8e54d45131d3,83f1215a37dc27328987eb2b7480195261ebda48..590f256ffaba615ff1bc6524c93f435522846f0e
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -52,10 -52,9 +52,11 @@@ Build-Depends: debhelper (>= 11)
                 xkb-data,
                 xvfb <!nocheck>,
                 xauth <!nocheck>,
 -               zenity
 +               zenity,
 +               libmtdev-dev,
 +               libgles2-mesa-dev
- Standards-Version: 4.1.4
+ Rules-Requires-Root: no
+ Standards-Version: 4.1.5
  Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git
  Vcs-Browser: https://salsa.debian.org/gnome-team/mutter