diff -Nru mutter-3.14.4/debian/changelog mutter-3.14.4/debian/changelog --- mutter-3.14.4/debian/changelog 2015-05-29 14:34:50.000000000 +0000 +++ mutter-3.14.4/debian/changelog 2015-06-07 13:05:56.000000000 +0000 @@ -1,3 +1,14 @@ +mutter (3.14.4-1~deb8u1+rpi1) jessie-staging; urgency=medium + + [changes brought back from 3.14.4-1+rpi1 by Peter Michael Green at Mon, 27 Apr 2015 19:18:06 +0000] + * Move libsystemd-login-dev from build-depends to build-conflicts and add + libsystemd-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 . + + -- Peter Michael Green Sun, 07 Jun 2015 11:56:22 +0000 + mutter (3.14.4-1~deb8u1) jessie; urgency=low * New upstream translation and bugfix release. diff -Nru mutter-3.14.4/debian/control mutter-3.14.4/debian/control --- mutter-3.14.4/debian/control 2015-05-29 14:37:52.000000000 +0000 +++ mutter-3.14.4/debian/control 2015-06-07 13:06:11.000000000 +0000 @@ -28,7 +28,6 @@ libgnome-desktop-3-dev (>= 3.10), libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-login-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libxcb-randr0-dev, libxcomposite-dev (>= 1:0.2), @@ -51,6 +50,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.14.4/debian/control.in mutter-3.14.4/debian/control.in --- mutter-3.14.4/debian/control.in 2014-10-24 18:52:54.000000000 +0000 +++ mutter-3.14.4/debian/control.in 2015-06-07 11:56:22.000000000 +0000 @@ -24,7 +24,6 @@ libgnome-desktop-3-dev (>= 3.10), libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-login-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libxcb-randr0-dev, libxcomposite-dev (>= 1:0.2), @@ -47,6 +46,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.14.4/debian/libmutter-dev.install mutter-3.14.4/debian/libmutter-dev.install --- mutter-3.14.4/debian/libmutter-dev.install 2014-08-24 23:35:18.000000000 +0000 +++ mutter-3.14.4/debian/libmutter-dev.install 2015-06-07 11:56:22.000000000 +0000 @@ -2,4 +2,3 @@ usr/lib/lib*.so usr/lib/pkgconfig/*.pc usr/lib/mutter/Meta-*.gir -usr/share/gtk-doc