diff -Nru mutter-3.18.1/debian/changelog mutter-3.18.1/debian/changelog
--- mutter-3.18.1/debian/changelog 2015-10-21 14:13:18.000000000 +0000
+++ mutter-3.18.1/debian/changelog 2015-10-22 02:12:07.000000000 +0000
@@ -1,3 +1,16 @@
+mutter (3.18.1-1+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.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 <plugwash@raspbian.org> Thu, 22 Oct 2015 01:01:18 +0000
+
mutter (3.18.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru mutter-3.18.1/debian/control mutter-3.18.1/debian/control
--- mutter-3.18.1/debian/control 2015-10-21 14:13:49.000000000 +0000
+++ mutter-3.18.1/debian/control 2015-10-22 02:17:41.000000000 +0000
@@ -6,7 +6,7 @@
Section: x11
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 9),
gnome-pkg-tools (>= 0.10),
@@ -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),
@@ -53,6 +52,9 @@
libwayland-dev (>= 1.5.90) [linux-any],
xkb-data,
zenity
+Build-conflicts:
+ libsystemd-login-dev,
+ libsystemd-dev
Standards-Version: 3.9.6
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.18.1/debian/control.in mutter-3.18.1/debian/control.in
--- mutter-3.18.1/debian/control.in 2015-10-21 14:10:57.000000000 +0000
+++ mutter-3.18.1/debian/control.in 2015-10-22 02:11:11.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),
@@ -49,6 +48,9 @@
libwayland-dev (>= 1.5.90) [linux-any],
xkb-data,
zenity
+Build-conflicts:
+ libsystemd-login-dev,
+ libsystemd-dev
Standards-Version: 3.9.6
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.18.1/debian/rules mutter-3.18.1/debian/rules
--- mutter-3.18.1/debian/rules 2015-06-15 14:49:31.000000000 +0000
+++ mutter-3.18.1/debian/rules 2015-10-22 02:11:15.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_libmutter0e = -V'libmutter0f (>= 3.16.0)'
@@ -26,3 +22,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