diff -Nru mutter-3.14.0/debian/changelog mutter-3.14.0/debian/changelog --- mutter-3.14.0/debian/changelog 2014-09-22 19:02:56.000000000 +0000 +++ mutter-3.14.0/debian/changelog 2014-10-15 01:34:39.000000000 +0000 @@ -1,3 +1,15 @@ +mutter (3.14.0-1+rpi1) jessie-staging; urgency=medium + + * Use clutter-1.0 instead of clutter-egl-1.0 pc file to allow build + with non-egl clutter. + * 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 Wed, 15 Oct 2014 00:53:26 +0000 + mutter (3.14.0-1) unstable; urgency=medium [ Dmitry Shachnev ] diff -Nru mutter-3.14.0/debian/control mutter-3.14.0/debian/control --- mutter-3.14.0/debian/control 2014-09-22 20:20:06.000000000 +0000 +++ mutter-3.14.0/debian/control 2014-10-15 01:39:43.000000000 +0000 @@ -26,7 +26,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.5 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.0/debian/control.in mutter-3.14.0/debian/control.in --- mutter-3.14.0/debian/control.in 2014-09-21 14:39:15.000000000 +0000 +++ mutter-3.14.0/debian/control.in 2014-10-15 01:39:16.000000000 +0000 @@ -22,7 +22,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), @@ -43,6 +42,9 @@ libwayland-dev (>= 1.5.90) [linux-any], xkb-data, zenity +Build-conflicts: + libsystemd-login-dev, + libsystemd-dev Standards-Version: 3.9.5 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.0/debian/libmutter-dev.install mutter-3.14.0/debian/libmutter-dev.install --- mutter-3.14.0/debian/libmutter-dev.install 2014-08-24 23:35:18.000000000 +0000 +++ mutter-3.14.0/debian/libmutter-dev.install 2014-10-15 01:34:02.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.14.0/debian/patches/no-clutter-egl.patch mutter-3.14.0/debian/patches/no-clutter-egl.patch --- mutter-3.14.0/debian/patches/no-clutter-egl.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.14.0/debian/patches/no-clutter-egl.patch 2014-10-15 00:55:10.000000000 +0000 @@ -0,0 +1,37 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + mutter (3.14.0-1+rpi1) jessie-staging; urgency=medium + . + * Use clutter-1.0 instead of clutter-egl-1.0 pc file to allow build + with non-egl clutter. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- mutter-3.14.0.orig/configure.ac ++++ mutter-3.14.0/configure.ac +@@ -77,7 +77,7 @@ MUTTER_PC_MODULES=" + cairo >= 1.10.0 + gsettings-desktop-schemas >= 3.7.3 + $CLUTTER_PACKAGE >= 1.19.5 +- clutter-egl-1.0 ++ clutter-1.0 + cogl-1.0 >= 1.17.1 + gbm + upower-glib >= 0.99.0 diff -Nru mutter-3.14.0/debian/patches/series mutter-3.14.0/debian/patches/series --- mutter-3.14.0/debian/patches/series 2014-09-05 18:36:51.000000000 +0000 +++ mutter-3.14.0/debian/patches/series 2014-10-15 00:55:10.000000000 +0000 @@ -1 +1,2 @@ 01_Wcast-align.patch +no-clutter-egl.patch