From: Raspbian forward pporter Date: Wed, 28 Jun 2017 22:18:37 +0000 (+0100) Subject: Merge version 3.22.3-2+rpi1 and 3.22.4-1 to produce 3.22.4-1+rpi1 X-Git-Tag: archive/raspbian/3.22.4-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79fe45a0eddd315240809c74c6cdfe19068fed5f;p=mutter.git Merge version 3.22.3-2+rpi1 and 3.22.4-1 to produce 3.22.4-1+rpi1 --- 79fe45a0eddd315240809c74c6cdfe19068fed5f diff --cc debian/changelog index 74d35c7,806f34e..88fb4a7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,22 -1,9 +1,29 @@@ - mutter (3.22.3-2+rpi1) stretch-staging; urgency=medium ++mutter (3.22.4-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.14.4-2+rpi1 by Peter Michael Green 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 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 Thu, 23 Mar 2017 22:22:20 +0000 ++ -- Raspbian forward porter Wed, 28 Jun 2017 22:18:36 +0000 ++ + mutter (3.22.4-1) unstable; urgency=medium + + * New upstream release. + * Drop patches which have been merged upstream. + + -- Michael Biebl Tue, 11 Apr 2017 15:56:47 +0200 mutter (3.22.3-2) unstable; urgency=medium diff --cc debian/patches/series index a6f6e38,ea9d7ea..50c5628 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,3 -1,1 +1,2 @@@ bgo768531_workaround-startup-notifications.patch - clutter-clone-Unset-source-when-source-actor-is-dest.patch +raspbian.diff