Merge version 3.22.1-2+rpi1 and 3.22.2-3 to produce 3.22.2-3+rpi1

diff --cc debian/changelog
index 75a6f55ace76852a7a666ffb357678e6cf22eda2,37676964e311c8279e45599be65bd70caca95ea5..e24b2eb22248aef08c9b7c723363a807956c3338
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,38 +1,58 @@@
- mutter (3.22.1-2+rpi1) stretch-staging; urgency=medium
++mutter (3.22.2-3+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 3.14.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 25 May 2015 01:53:01 +0000]
 +  * Move libsystemd-dev from build-depends to build-conflicts and add
 +    libsystemd-login-dev to build-conflicts to prevent build of native backend 
 +    which fails with non-egl clutter.
 +  [changes introduced in 3.21.92-1+rpi1 by Peter Michael Green]
 +  * Modify debian/rules to Use wayland disabling settings (as used 
 +    by non-linux ports of debian)
 +  * fix clean target.
 +  * Move wayland related build-dependencies to build-conflicts.
 +  * Add --disable-xlib-egl-platform to configure flags
 +  * Comment out #include <cogl/winsys/cogl-winsys-egl-private.h> in
 +    cogl/cogl/cogl-mutter.h
 +  * Make further hacks to make non-egl build succeed (and probablly break egl builds in the process).
 +  [changes introduced in 3.22.1-2+rpi1 by Peter Michael Green]
 +  * Remove build-dependency on libegl1-mesa-dev
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 21 Oct 2016 23:24:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Jan 2017 02:27:05 +0000
++
+ mutter (3.22.2-3) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Add git_flush_all_swap_notifies_on_idle.patch:
+     - Add patch from 3.22 branch that fixes freezes with multiple monitors
+       on Wayland
+ 
+   [ Andreas Henriksson ]
+   * Add debian/patches/bgo768531_workaround-startup-notifications.patch
+     - temporary workaround used in both Fedora and Arch for getting
+       working application startup notifications under Wayland.
+     - See bgo#768531 for when a real solution is ready to replace this.
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Sun, 08 Jan 2017 03:12:13 +0100
+ 
+ mutter (3.22.2-2) unstable; urgency=critical
+ 
+   [ Raphaël Hertzog ]
+   * Team upload.
+   * Urgency critical as gnome-shell is entirely broken in testing
+     for many users.
+ 
+   [ Jeremy Bicha ]
+   * Add git_dont_set_unavailable_scroll_methods.patch:
+     - Add patch from 3.22 branch that prevented logging into GNOME on X
+       for some users (LP: #1643370, Closes: #846898)
+ 
+  -- Raphaël Hertzog <hertzog@debian.org>  Tue, 06 Dec 2016 17:35:40 +0100
+ 
+ mutter (3.22.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches, all merged upstream.
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:17:32 +0100
  
  mutter (3.22.1-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index e4673f2a3a483af2721f3a42943309b37be0131b,328550a5a215c6a35f8cfcade90217ed74d0cdde..0f59384d4e311fd90a5b2828096f191b546cd1c3
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,3 +1,4 @@@
- wayland-xdg-popup-Always-use-monitor-of-toplevel.patch
- wayland-xdg-shell-Scale-configure-relative-popup-coo.patch
- wayland-xdg-popup-Force-monitor-of-the-top-level.patch
- wayland-xdg-shell-update-popup-window-monitor-early.patch
- wayland-xdg-shell-Scale-positioner-coordinates.patch
+ git_dont_set_unavailable_scroll_methods.patch
+ git_flush_all_swap_notifies_on_idle.patch
+ bgo768531_workaround-startup-notifications.patch
 +raspbian.diff