diff -Nru mutter-3.20.1/debian/changelog mutter-3.20.1/debian/changelog --- mutter-3.20.1/debian/changelog 2016-04-16 22:06:57.000000000 +0000 +++ mutter-3.20.1/debian/changelog 2016-04-26 22:16:20.000000000 +0000 @@ -1,3 +1,16 @@ +mutter (3.20.1-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.16.2-2+rpi1 by Peter Michael Green] + * Remove --enable-native-backend and --enable-wayland from + DEB_CONFIGURE_EXTRA_FLAGS in debian/rules + * cleanup config.log in debian/rules clean. + + -- Peter Michael Green Tue, 26 Apr 2016 16:41:17 +0000 + mutter (3.20.1-1) unstable; urgency=medium * New upstream release. diff -Nru mutter-3.20.1/debian/control mutter-3.20.1/debian/control --- mutter-3.20.1/debian/control 2016-04-16 22:07:25.000000000 +0000 +++ mutter-3.20.1/debian/control 2016-04-26 22:21:09.000000000 +0000 @@ -29,7 +29,6 @@ libgudev-1.0-dev [linux-any], libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libxcb-randr0-dev, libxcomposite-dev (>= 1:0.2), @@ -54,6 +53,9 @@ wayland-protocols (>= 1.1) [linux-any], xkb-data, zenity +Build-conflicts: + libsystemd-login-dev, + libsystemd-dev Standards-Version: 3.9.7 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter diff -Nru mutter-3.20.1/debian/control.in mutter-3.20.1/debian/control.in --- mutter-3.20.1/debian/control.in 2016-04-16 22:00:56.000000000 +0000 +++ mutter-3.20.1/debian/control.in 2016-04-26 22:15:06.000000000 +0000 @@ -25,7 +25,6 @@ libgudev-1.0-dev [linux-any], libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libxcb-randr0-dev, libxcomposite-dev (>= 1:0.2), @@ -50,6 +49,9 @@ wayland-protocols (>= 1.1) [linux-any], xkb-data, zenity +Build-conflicts: + libsystemd-login-dev, + libsystemd-dev Standards-Version: 3.9.7 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter diff -Nru mutter-3.20.1/debian/rules mutter-3.20.1/debian/rules --- mutter-3.20.1/debian/rules 2016-04-16 21:57:27.000000000 +0000 +++ mutter-3.20.1/debian/rules 2016-04-26 22:15:06.000000000 +0000 @@ -14,10 +14,6 @@ --enable-startup-notification=yes \ --enable-compile-warnings=yes -ifeq ($(DEB_HOST_ARCH_OS),linux) -DEB_CONFIGURE_EXTRA_FLAGS += --enable-wayland --enable-native-backend -endif - DEB_DH_GIREPOSITORY_ARGS_ALL := /usr/lib/mutter DEB_DH_MAKESHLIBS_ARGS_libmutter0h = -V'libmutter0h (>= 3.19.0)' @@ -28,3 +24,6 @@ # LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed common-binary-post-install-arch:: list-missing + +clean:: + rm -f config.log \ No newline at end of file