From: Raspbian forward pporter Date: Thu, 2 Mar 2017 16:03:26 +0000 (+0000) Subject: Merge version 3.22.2-3+rpi1 and 3.22.3-1 to produce 3.22.3-1+rpi1 X-Git-Tag: archive/raspbian/3.22.3-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f6732152446b752cd63afab4edf977351f9933ca;p=mutter.git Merge version 3.22.2-3+rpi1 and 3.22.3-1 to produce 3.22.3-1+rpi1 --- f6732152446b752cd63afab4edf977351f9933ca diff --cc debian/changelog index e24b2eb,7fb3631..584f628 --- a/debian/changelog +++ b/debian/changelog @@@ -1,22 -1,9 +1,29 @@@ - mutter (3.22.2-3+rpi1) stretch-staging; urgency=medium ++mutter (3.22.3-1+rpi1) stretch-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 Fri, 20 Jan 2017 02:27:05 +0000 ++ -- Raspbian forward porter Thu, 02 Mar 2017 16:03:25 +0000 ++ + mutter (3.22.3-1) unstable; urgency=medium + + * New upstream release. + * Drop patches which have been merged upstream. + + -- Michael Biebl Fri, 17 Feb 2017 18:17:07 +0100 mutter (3.22.2-3) unstable; urgency=medium diff --cc debian/patches/series index 0f59384,ea9d7ea..50c5628 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,1 +1,2 @@@ - git_dont_set_unavailable_scroll_methods.patch - git_flush_all_swap_notifies_on_idle.patch bgo768531_workaround-startup-notifications.patch +raspbian.diff