From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 20 Jul 2017 13:39:07 +0000 (+0100)
Subject: Merge version 3.22.4-1+rpi1 and 3.22.4-2 to produce 3.22.4-2+rpi1
X-Git-Tag: archive/raspbian/3.22.4-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e70f7e513c1953f7b6b23301f67111190297a27;p=mutter.git

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

5e70f7e513c1953f7b6b23301f67111190297a27
diff --cc debian/changelog
index 88fb4a7,1177c47..9be82c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,16 +1,40 @@@
++mutter (3.22.4-2+rpi1) buster-staging; urgency=medium
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jul 2017 13:39:07 +0000
++
+ mutter (3.22.4-2) unstable; urgency=medium
+ 
+   [ Jeremy Bicha ]
+   * Add missing depends on gnome-settings-daemon (LP: #1561706)
+ 
+   [ Laurent Bigonville ]
+   * debian/patches/bgo782472_fix_copypaste_x11_wayland.patch: Fix copy/paste
+     between some X11 applications (firefox/chromium) and wayland (Closes:
+     #865788)
+   * debian/control.in: Bump Standards-Version to 4.0.0 (no further changes)
+ 
+  -- Laurent Bigonville <bigon@debian.org>  Fri, 30 Jun 2017 19:08:41 +0200
+ 
 +mutter (3.22.4-1+rpi1) buster-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
 +
 + -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Jun 2017 22:18:36 +0000
 +
  mutter (3.22.4-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 475a1c7,e664d9e..b5fe4ff
--- a/debian/control
+++ b/debian/control
@@@ -48,14 -50,11 +48,14 @@@ Build-Depends: debhelper (>= 10)
                 libsm-dev,
                 libice-dev,
                 libpam0g-dev,
 -               libwayland-dev (>= 1.5.90) [linux-any],
 -               wayland-protocols (>= 1.7) [linux-any],
                 xkb-data,
                 zenity
 +Build-conflicts:
 +               libwayland-dev (>= 1.5.90) [linux-any],
 +               wayland-protocols (>= 1.7) [linux-any],
 +               libsystemd-login-dev,
 +               libsystemd-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
  Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter
  Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
  
diff --cc debian/control.in
index 744233d,36c40b7..247b90b
--- a/debian/control.in
+++ b/debian/control.in
@@@ -44,14 -46,11 +44,14 @@@ Build-Depends: debhelper (>= 10)
                 libsm-dev,
                 libice-dev,
                 libpam0g-dev,
 -               libwayland-dev (>= 1.5.90) [linux-any],
 -               wayland-protocols (>= 1.7) [linux-any],
                 xkb-data,
                 zenity
 +Build-conflicts:
 +               libwayland-dev (>= 1.5.90) [linux-any],
 +               wayland-protocols (>= 1.7) [linux-any],
 +               libsystemd-login-dev,
 +               libsystemd-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
  Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter
  Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
  
diff --cc debian/patches/series
index 50c5628,6c03460..0453de0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
  bgo768531_workaround-startup-notifications.patch
+ bgo782472_fix_copypaste_x11_wayland.patch
 +raspbian.diff