diff -Nru mutter-3.16.2/debian/changelog mutter-3.16.2/debian/changelog
--- mutter-3.16.2/debian/changelog 2015-06-14 11:45:37.000000000 +0000
+++ mutter-3.16.2/debian/changelog 2015-06-27 23:35:38.000000000 +0000
@@ -1,3 +1,18 @@
+mutter (3.16.2-2+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.
+ * Remove /usr/share/gtk-doc (which seems to have dissapeared due to our other
+ changes) from libmutter-dev.install .
+ [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> Sat, 27 Jun 2015 22:13:13 +0000
+
mutter (3.16.2-2) unstable; urgency=medium
* Upload to unstable.
diff -Nru mutter-3.16.2/debian/control mutter-3.16.2/debian/control
--- mutter-3.16.2/debian/control 2015-06-14 12:01:26.000000000 +0000
+++ mutter-3.16.2/debian/control 2015-06-27 23:36:19.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),
@@ -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: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
diff -Nru mutter-3.16.2/debian/control.in mutter-3.16.2/debian/control.in
--- mutter-3.16.2/debian/control.in 2015-05-08 13:48:21.000000000 +0000
+++ mutter-3.16.2/debian/control.in 2015-06-27 22:13:14.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: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter
diff -Nru mutter-3.16.2/debian/libmutter-dev.install mutter-3.16.2/debian/libmutter-dev.install
--- mutter-3.16.2/debian/libmutter-dev.install 2014-08-24 23:35:18.000000000 +0000
+++ mutter-3.16.2/debian/libmutter-dev.install 2015-06-27 22:13:14.000000000 +0000
@@ -2,4 +2,3 @@
usr/lib/lib*.so
usr/lib/pkgconfig/*.pc
usr/lib/mutter/Meta-*.gir
-usr/share/gtk-doc
diff -Nru mutter-3.16.2/debian/rules mutter-3.16.2/debian/rules
--- mutter-3.16.2/debian/rules 2015-05-08 13:33:32.000000000 +0000
+++ mutter-3.16.2/debian/rules 2015-06-27 23:36:12.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