[compiz-plugins-main] initial import

Wolfgang Ulbrich raveit65 at fedoraproject.org
Tue Dec 11 00:57:09 UTC 2012


commit bcd7f84013573d241d823560979132697064a90e
Author: raveit <chat-to-me at raveit.de>
Date:   Tue Dec 11 01:56:39 2012 +0100

    initial import

 .gitignore                                         |    1 +
 compiz-plugins-main.spec                           |  178 +++
 ...lugins-main_expo_reflection_is_unphysical.patch |   14 +
 compiz-plugins-main_fix_edges.patch                |  193 +++
 ...iz-plugins-main_incorrect-fsf-address_fix.patch |   12 +
 compiz-plugins-main_mate.patch                     | 1571 ++++++++++++++++++++
 compiz-plugins-main_plugin-matecompat.svg          |  134 ++
 dead.package                                       |    1 -
 sources                                            |    1 +
 9 files changed, 2104 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9001c8..637c8ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /compiz-plugins-main-0.9.4.tar.bz2
 /compiz-plugins-main-0.9.5.0.tar.bz2
 /compiz-plugins-main-0.9.5.92.tar.bz2
+/compiz-plugins-main-0.8.8.tar.bz2
diff --git a/compiz-plugins-main.spec b/compiz-plugins-main.spec
new file mode 100644
index 0000000..91028ff
--- /dev/null
+++ b/compiz-plugins-main.spec
@@ -0,0 +1,178 @@
+%global plugins      animation colorfilter expo ezoom imgjpeg mag mousepoll neg opacify put resizeinfo ring scaleaddon session shift snap staticswitcher text thumbnail titleinfo vpswitch winrules workarounds
+
+%global schemas      compiz-animation compiz-colorfilter compiz-expo compiz-ezoom compiz-imgjpeg compiz-mag compiz-mousepoll compiz-neg compiz-opacify compiz-put compiz-resizeinfo compiz-ring compiz-scaleaddon compiz-session compiz-shift compiz-snap compiz-staticswitcher compiz-text compiz-thumbnail compiz-titleinfo compiz-vpswitch compiz-winrules compiz-workarounds
+
+%global  basever 0.8.8
+
+Name:    compiz-plugins-main
+Version: 0.8.8
+Release: 4%{?dist}
+Epoch:   1
+Summary: Collection of Compiz Fusion plugins for Compiz      
+Group:   User Interface/Desktops        
+License: GPLv2+       
+URL:     http://www.compiz.org             
+Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
+Source1: compiz-plugins-main_plugin-matecompat.svg
+
+Patch0:  compiz-plugins-main_mate.patch
+# new from debian 
+# https://bugs.launchpad.net/bugs/103306
+Patch1:  compiz-plugins-main_fix_edges.patch
+# https://bugs.launchpad.net/bugs/326995
+Patch2:  compiz-plugins-main_expo_reflection_is_unphysical.patch
+
+Patch3:  compiz-plugins-main_incorrect-fsf-address_fix.patch
+
+# libdrm is not available on these arches
+ExcludeArch:   s390 s390x
+
+BuildRequires: compiz-devel >= %{basever}
+BuildRequires: compiz-bcop >= %{basever}
+BuildRequires: gettext-devel
+BuildRequires: cairo-devel
+BuildRequires: pango-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: mesa-libGLU-devel
+BuildRequires: libXrender-devel
+BuildRequires: mate-conf
+BuildRequires: libjpeg-devel
+BuildRequires: intltool
+
+Requires: compiz%{?_isa} >= %{basever}
+
+%description
+The Compiz Fusion Project brings 3D desktop visual effects that improve
+usability of the X Window System and provide increased productivity
+though plugins and themes contributed by the community giving a
+rich desktop experience
+
+
+%package mate
+Summary: Compiz Fusion mate configuration
+Group: User Interface/Desktops
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires(pre): mate-conf
+Requires(post): mate-conf
+Requires(preun): mate-conf
+
+%description mate
+This package contains the MATE configuration for Compiz
+Fusion
+
+%package devel
+Group: Development/Libraries
+Summary: Development files for Compiz-Fusion
+Requires: compiz-devel%{?_isa} >= %{basever}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: cairo-devel
+Requires: pango-devel
+
+%description devel
+This package contain development files required for developing other plugins
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .mate
+%patch1 -p1 -b .edges
+%patch2 -p1 -b .expo_reflection
+%patch3 -p1 -b .incorrect-fsf-address
+mv images/Gnome/*.png images/Mate/
+rm -rf images/Gnome
+
+
+%build
+%configure --enable-schemas
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.a
+# remove wall plugin
+rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/wall.xml
+rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/libwall.so
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-wall.schemas
+# remove kdecompat plugin
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mateconf/schemas/compiz-kdecompat.schemas
+rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/libkdecompat.so
+rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/kdecompat.xml
+
+# matecompat icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps
+cp -f %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg
+
+# remove oxygen images
+rm -rf $RPM_BUILD_ROOT%{_datadir}/compiz/Oxygen
+
+%find_lang compiz-plugins-main
+
+
+%post mate
+%mateconf_schema_upgrade %{schemas}
+
+%pre mate
+%mateconf_schema_prepare %{schemas}
+
+%preun mate
+%mateconf_schema_remove %{schemas}
+
+%post
+/bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || :
+
+
+%files -f %{name}.lang
+%doc COPYING AUTHORS
+%{_libdir}/compiz/*.so
+%{_datadir}/compiz/*.xml
+%{_datadir}/compiz/filters/
+%{_datadir}/compiz/Mate/
+%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg
+
+%files  mate
+%config %{_sysconfdir}/mateconf/schemas/*.schemas
+
+%files devel
+%{_includedir}/compiz/
+%{_libdir}/pkgconfig/compiz-*
+
+
+%changelog
+* Mon Oct 15 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1:0.8.8-4
+- own include dir
+- move icons from gnome to mate folder in source
+- add requires compiz
+- remove oxygen images
+- add patches from Jasmine Hassan jasmine.aura at gmail.com
+- add icon cache scriplets
+- add compiz-plugins-main_incorrect-fsf-address_fix.patch
+- add epoch
+- add basever
+- initial build for fedora
+
+* Sat Sep 29 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 0.8.8-3
+- remove kdecompat
+- correct plugin %%global
+- fix source url
+
+* Wed Sep 19 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 0.8.8-2
+- add source overlay.png and mask.png
+- improve spec file
+- remove obsolete beryl stuff
+- add compiz-plugins-main_mate.patch
+
+* Tue May 15 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 0.8.8-1
+- build for mate
+
diff --git a/compiz-plugins-main_expo_reflection_is_unphysical.patch b/compiz-plugins-main_expo_reflection_is_unphysical.patch
new file mode 100644
index 0000000..e383448
--- /dev/null
+++ b/compiz-plugins-main_expo_reflection_is_unphysical.patch
@@ -0,0 +1,14 @@
+Description: Change default reflection scale value from 0.75 to 1.0. Anything else is unphysical 
+Bug: https://bugs.launchpad.net/bugs/326995
+
+--- a/metadata/expo.xml.in
++++ b/metadata/expo.xml.in
+@@ -237,7 +237,7 @@
+ 					<option name="scale_factor" type="float">
+ 						<_short>Reflection Scale</_short>
+ 						<_long>Scale factor of the expo wall reflection</_long>
+-						<default>0.75</default>
++						<default>1.0</default>
+ 						<min>0.0</min>
+ 						<max>2.0</max>
+ 						<precision>0.01</precision>
diff --git a/compiz-plugins-main_fix_edges.patch b/compiz-plugins-main_fix_edges.patch
new file mode 100644
index 0000000..7c110f6
--- /dev/null
+++ b/compiz-plugins-main_fix_edges.patch
@@ -0,0 +1,193 @@
+Description: Fix window edge behaviour
+Author: https://bugs.launchpad.net/bugs/103306
+
+--- a/metadata/wall.xml.in
++++ b/metadata/wall.xml.in
+@@ -280,6 +280,7 @@
+ 						<_short>Flip Left</_short>
+ 						<_long>Flip left</_long>
+ 						<nodelay>true</nodelay>
++  						<passive_grab>false</passive_grab>
+ 						<default>
+ 							<edge name="Left"/>
+ 						</default>
+@@ -289,6 +290,7 @@
+ 						<_short>Flip Right</_short>
+ 						<_long>Flip right</_long>
+ 						<nodelay>true</nodelay>
++  						<passive_grab>false</passive_grab>
+ 						<default>
+ 							<edge name="Right"/>
+ 						</default>
+@@ -298,6 +300,7 @@
+ 						<_short>Flip Up</_short>
+ 						<_long>Flip up</_long>
+ 						<nodelay>true</nodelay>
++  						<passive_grab>false</passive_grab>
+ 						<default>
+ 							<edge name="Top"/>
+ 						</default>
+@@ -307,6 +310,7 @@
+ 						<_short>Flip Down</_short>
+ 						<_long>Flip down</_long>
+ 						<nodelay>true</nodelay>
++  						<passive_grab>false</passive_grab>
+ 						<default>
+ 							<edge name="Bottom"/>
+ 						</default>
+--- a/src/wall/wall.c
++++ b/src/wall/wall.c
+@@ -111,6 +111,8 @@ typedef struct _WallScreen
+     WindowUngrabNotifyProc       windowUngrabNotify;
+     ActivateWindowProc           activateWindow;
+ 
++    int grabCount;
++
+     Bool moving; /* Used to track miniview movement */
+     Bool showPreview;
+ 
+@@ -178,6 +180,38 @@ typedef struct _WallWindow
+ 
+ 
+ static void
++wallScreenOptionChangeNotify (CompScreen *s, CompOption *opt,
++			      WallScreenOptions num)
++{
++    WALL_SCREEN (s);
++
++    if (ws->grabCount == -1 || ws->grabCount > 0)
++    {
++	removeScreenAction (s, wallGetFlipLeftEdge(s->display));
++	removeScreenAction (s, wallGetFlipRightEdge(s->display));
++	removeScreenAction (s, wallGetFlipUpEdge(s->display));
++	removeScreenAction (s, wallGetFlipDownEdge(s->display));
++    }
++
++    if (wallGetEdgeflipPointer (s) || wallGetEdgeflipMove (s) ||
++	wallGetEdgeflipDnd (s))
++    {
++	if (!wallGetEdgeflipPointer (s) && !wallGetEdgeflipDnd (s))
++	    ws->grabCount = 0;
++	else
++	{
++	    ws->grabCount = -1;
++	    addScreenAction (s, wallGetFlipLeftEdge(s->display));
++	    addScreenAction (s, wallGetFlipRightEdge(s->display));
++	    addScreenAction (s, wallGetFlipUpEdge(s->display));
++	    addScreenAction (s, wallGetFlipDownEdge(s->display));
++	}
++    }
++    else
++	ws->grabCount = -2;
++}
++
++static void
+ wallClearCairoLayer (cairo_t *cr)
+ {
+     cairo_save (cr);
+@@ -1903,11 +1937,25 @@ wallWindowGrabNotify (CompWindow   *w,
+ 		      unsigned int state,
+ 		      unsigned int mask)
+ {
+-    WALL_SCREEN (w->screen);
++    CompScreen *s = w->screen;
++    WALL_SCREEN (s);
+ 
+     if (!ws->grabWindow)
+ 	ws->grabWindow = w;
+ 
++    if (ws->grabCount >= 0)
++    {
++	if (!ws->grabCount)
++	{
++	    addScreenAction (s, wallGetFlipLeftEdge(s->display));
++	    addScreenAction (s, wallGetFlipRightEdge(s->display));
++	    addScreenAction (s, wallGetFlipUpEdge(s->display));
++	    addScreenAction (s, wallGetFlipDownEdge(s->display));
++	}
++
++	ws->grabCount++;
++    }
++
+     UNWRAP (ws, w->screen, windowGrabNotify);
+     (*w->screen->windowGrabNotify) (w, x, y, state, mask);
+     WRAP (ws, w->screen, windowGrabNotify, wallWindowGrabNotify);
+@@ -1916,11 +1964,25 @@ wallWindowGrabNotify (CompWindow   *w,
+ static void
+ wallWindowUngrabNotify (CompWindow *w)
+ {
+-    WALL_SCREEN (w->screen);
++    CompScreen *s = w->screen;
++    WALL_SCREEN (s);
+ 
+     if (w == ws->grabWindow)
+ 	ws->grabWindow = NULL;
+ 
++    if (ws->grabCount >= 0)
++    {
++	ws->grabCount--;
++
++	if (!ws->grabCount)
++	{
++	    removeScreenAction (s, wallGetFlipLeftEdge(s->display));
++	    removeScreenAction (s, wallGetFlipRightEdge(s->display));
++	    removeScreenAction (s, wallGetFlipUpEdge(s->display));
++	    removeScreenAction (s, wallGetFlipDownEdge(s->display));
++	}
++    }
++
+     UNWRAP (ws, w->screen, windowUngrabNotify);
+     (*w->screen->windowUngrabNotify) (w);
+     WRAP (ws, w->screen, windowUngrabNotify, wallWindowUngrabNotify);
+@@ -2122,6 +2184,8 @@ wallInitScreen (CompPlugin *p,
+     ws->transform  = NoTransformation;
+     ws->direction  = -1;
+ 
++    ws->grabCount = 0;
++
+     memset (&ws->switcherContext, 0, sizeof (WallCairoContext));
+     memset (&ws->thumbContext, 0, sizeof (WallCairoContext));
+     memset (&ws->highlightContext, 0, sizeof (WallCairoContext));
+@@ -2137,6 +2201,27 @@ wallInitScreen (CompPlugin *p,
+     WRAP (ws, s, windowUngrabNotify, wallWindowUngrabNotify);
+     WRAP (ws, s, activateWindow, wallActivateWindow);
+ 
++    wallSetEdgeflipPointerNotify (s, wallScreenOptionChangeNotify);
++    wallSetEdgeflipMoveNotify (s, wallScreenOptionChangeNotify);
++    wallSetEdgeflipDndNotify (s, wallScreenOptionChangeNotify);
++
++    if (wallGetEdgeflipPointer (s) || wallGetEdgeflipMove (s) ||
++	wallGetEdgeflipDnd (s))
++    {
++	if (!wallGetEdgeflipPointer (s) && !wallGetEdgeflipDnd (s))
++	    ws->grabCount = 0;
++	else
++	{
++	    ws->grabCount = -1;
++	    addScreenAction (s, wallGetFlipLeftEdge(s->display));
++	    addScreenAction (s, wallGetFlipRightEdge(s->display));
++	    addScreenAction (s, wallGetFlipUpEdge(s->display));
++	    addScreenAction (s, wallGetFlipDownEdge(s->display));
++	}
++    }
++    else
++	ws->grabCount = -2;
++
+     s->base.privates[wd->screenPrivateIndex].ptr = ws;
+ 
+     wallCreateCairoContexts (s, TRUE);
+@@ -2170,6 +2255,14 @@ wallFiniScreen (CompPlugin *p,
+     
+     freeWindowPrivateIndex (s, ws->windowPrivateIndex);
+ 
++    if (ws->grabCount > 0 || ws->grabCount == -1)
++    {
++	removeScreenAction (s, wallGetFlipLeftEdge(s->display));
++	removeScreenAction (s, wallGetFlipRightEdge(s->display));
++	removeScreenAction (s, wallGetFlipUpEdge(s->display));
++	removeScreenAction (s, wallGetFlipDownEdge(s->display));
++    }
++
+     free(ws);
+ }
+ 
diff --git a/compiz-plugins-main_incorrect-fsf-address_fix.patch b/compiz-plugins-main_incorrect-fsf-address_fix.patch
new file mode 100644
index 0000000..f456bbc
--- /dev/null
+++ b/compiz-plugins-main_incorrect-fsf-address_fix.patch
@@ -0,0 +1,12 @@
+diff -upr compiz-plugins-main-0.8.8-orig/src/workarounds/workarounds.c compiz-plugins-main-0.8.8/src/workarounds/workarounds.c
+--- compiz-plugins-main-0.8.8-orig/src/workarounds/workarounds.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/workarounds/workarounds.c	2012-12-05 10:34:15.622788962 +0100
+@@ -15,7 +15,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  *
+  * This plug-in for Marco-like workarounds.
+  */
diff --git a/compiz-plugins-main_mate.patch b/compiz-plugins-main_mate.patch
new file mode 100644
index 0000000..e6be062
--- /dev/null
+++ b/compiz-plugins-main_mate.patch
@@ -0,0 +1,1571 @@
+diff -upr compiz-plugins-main-0.8.8-orig/aclocal.m4 compiz-plugins-main-0.8.8/aclocal.m4
+--- compiz-plugins-main-0.8.8-orig/aclocal.m4	2011-04-21 13:41:53.000000000 +0200
++++ compiz-plugins-main-0.8.8/aclocal.m4	2012-05-16 14:10:05.000000000 +0200
+@@ -19,40 +19,40 @@ You have another version of autoconf.  I
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl  (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl AM_MATECONF_SOURCE_2
++dnl Defines MATECONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to mateconftool-2
++dnl Defines MATECONF_SCHEMA_FILE_DIR which is a filesystem directory where
+ dnl  you should install foo.schemas files
+ dnl
+ 
+-AC_DEFUN([AM_GCONF_SOURCE_2],
++AC_DEFUN([AM_MATECONF_SOURCE_2],
+ [
+-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
+   else
+-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++    MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE
+   fi
+ 
+-  AC_ARG_WITH([gconf-source],
+-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++  AC_ARG_WITH([mateconf-source],
++	      AC_HELP_STRING([--with-mateconf-source=sourceaddress],
+ 			     [Config database for installing schema files.]),
+-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++	      [MATECONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+ 
+-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++  AC_SUBST(MATECONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation])
+ 
+-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then
++    MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas'
+   fi
+ 
+-  AC_ARG_WITH([gconf-schema-file-dir],
+-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++  AC_ARG_WITH([mateconf-schema-file-dir],
++	      AC_HELP_STRING([--with-mateconf-schema-file-dir=dir],
+ 			     [Directory for installing schema files.]),
+-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++	      [MATECONF_SCHEMA_FILE_DIR="$withval"],)
+ 
+-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++  AC_SUBST(MATECONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files])
+ 
+   AC_ARG_ENABLE(schemas-install,
+   	AC_HELP_STRING([--disable-schemas-install],
+@@ -61,7 +61,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
+        yes|no) ;;
+        *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+       esac])
+-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++  AM_CONDITIONAL([MATECONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+ ])
+ 
+ # Copyright (C) 1995-2002 Free Software Foundation, Inc.
+diff -upr compiz-plugins-main-0.8.8-orig/config.h.in compiz-plugins-main-0.8.8/config.h.in
+--- compiz-plugins-main-0.8.8-orig/config.h.in	2011-04-21 13:41:55.000000000 +0200
++++ compiz-plugins-main-0.8.8/config.h.in	2012-05-16 14:09:40.000000000 +0200
+@@ -94,7 +94,7 @@
+ /* Build scaleaddon plugin */
+ #undef USE_SCALEADDON
+ 
+-/* Build gconf schemas */
++/* Build mateconf schemas */
+ #undef USE_SCHEMAS
+ 
+ /* Build text plugin */
+diff -upr compiz-plugins-main-0.8.8-orig/configure compiz-plugins-main-0.8.8/configure
+--- compiz-plugins-main-0.8.8-orig/configure	2011-04-21 13:41:55.000000000 +0200
++++ compiz-plugins-main-0.8.8/configure	2012-05-16 14:10:08.000000000 +0200
+@@ -748,14 +748,14 @@ LTLIBOBJS
+ LIBOBJS
+ USE_SCHEMAS_FALSE
+ USE_SCHEMAS_TRUE
+-GCONF_SCHEMAS_INSTALL_FALSE
+-GCONF_SCHEMAS_INSTALL_TRUE
+-GCONF_SCHEMA_FILE_DIR
+-GCONF_SCHEMA_CONFIG_SOURCE
++MATECONF_SCHEMAS_INSTALL_FALSE
++MATECONF_SCHEMAS_INSTALL_TRUE
++MATECONF_SCHEMA_FILE_DIR
++MATECONF_SCHEMA_CONFIG_SOURCE
+ xsltdir
+ SCHEMAS_LIBS
+ SCHEMAS_CFLAGS
+-GCONFTOOL
++MATECONFTOOL
+ JPEG_PLUGIN_FALSE
+ JPEG_PLUGIN_TRUE
+ SCALEADDON_PLUGIN_FALSE
+@@ -952,8 +952,8 @@ with_gl_cflags
+ with_gl_libs
+ enable_jpeg
+ enable_schemas
+-with_gconf_source
+-with_gconf_schema_file_dir
++with_mateconf_source
++with_mateconf_schema_file_dir
+ enable_schemas_install
+ '
+       ac_precious_vars='build_alias
+@@ -1612,7 +1612,7 @@ Optional Features:
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --disable-nls           do not use Native Language Support
+   --disable-jpeg      Disable jpeg plugin
+-  --enable-schemas         Build gconf schemas
++  --enable-schemas         Build mateconf schemas
+   --disable-schemas-install
+                           Disable the schemas installation
+ 
+@@ -1624,9 +1624,9 @@ Optional Packages:
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-gl-cflags=CFLAGS
+   --with-gl-libs=LIBS
+-  --with-gconf-source=sourceaddress
++  --with-mateconf-source=sourceaddress
+                           Config database for installing schema files.
+-  --with-gconf-schema-file-dir=dir
++  --with-mateconf-schema-file-dir=dir
+                           Directory for installing schema files.
+ 
+ Some influential environment variables:
+@@ -13669,16 +13669,16 @@ fi
+ 
+ 
+ if test x"$use_schemas" = x"yes"; then
+-  # Extract the first word of "gconftool-2", so it can be a program name with args.
+-set dummy gconftool-2; ac_word=$2
++  # Extract the first word of "mateconftool-2", so it can be a program name with args.
++set dummy mateconftool-2; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
++if test "${ac_cv_path_MATECONFTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  case $GCONFTOOL in
++  case $MATECONFTOOL in
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
++  ac_cv_path_MATECONFTOOL="$MATECONFTOOL" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -13688,7 +13688,7 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
++    ac_cv_path_MATECONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -13696,14 +13696,14 @@ done
+   done
+ IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
++  test -z "$ac_cv_path_MATECONFTOOL" && ac_cv_path_MATECONFTOOL="no"
+   ;;
+ esac
+ fi
+-GCONFTOOL=$ac_cv_path_GCONFTOOL
+-if test -n "$GCONFTOOL"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
+-$as_echo "$GCONFTOOL" >&6; }
++MATECONFTOOL=$ac_cv_path_MATECONFTOOL
++if test -n "$MATECONFTOOL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MATECONFTOOL" >&5
++$as_echo "$MATECONFTOOL" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -13719,12 +13719,12 @@ if test -n "$SCHEMAS_CFLAGS"; then
+     pkg_cv_SCHEMAS_CFLAGS="$SCHEMAS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-gconf\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "compiz-gconf") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-mateconf\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "compiz-mateconf") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_SCHEMAS_CFLAGS=`$PKG_CONFIG --cflags "compiz-gconf" 2>/dev/null`
++  pkg_cv_SCHEMAS_CFLAGS=`$PKG_CONFIG --cflags "compiz-mateconf" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13735,12 +13735,12 @@ if test -n "$SCHEMAS_LIBS"; then
+     pkg_cv_SCHEMAS_LIBS="$SCHEMAS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-gconf\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "compiz-gconf") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"compiz-mateconf\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "compiz-mateconf") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_SCHEMAS_LIBS=`$PKG_CONFIG --libs "compiz-gconf" 2>/dev/null`
++  pkg_cv_SCHEMAS_LIBS=`$PKG_CONFIG --libs "compiz-mateconf" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13760,9 +13760,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "compiz-gconf" 2>&1`
++	        SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "compiz-mateconf" 2>&1`
+         else
+-	        SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "compiz-gconf" 2>&1`
++	        SCHEMAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "compiz-mateconf" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SCHEMAS_PKG_ERRORS" >&5
+@@ -13779,8 +13779,8 @@ else
+ $as_echo "yes" >&6; }
+ 	use_schemas=yes
+ fi
+-  if test x"$GCONFTOOL" = xno; then
+-    as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5
++  if test x"$MATECONFTOOL" = xno; then
++    as_fn_error $? "mateconftool-2 executable not found in your path - should be installed with MateConf" "$LINENO" 5
+   fi
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+@@ -13826,42 +13826,42 @@ fi
+   if test x"$PKG_CONFIG" = xno ; then
+     as_fn_error $? "pkg-config executable not found in your path, unable to determine schema directory" "$LINENO" 5
+   fi
+-  xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
++  xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-mateconf`
+ 
+ fi
+ 
+ 
+-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
+   else
+-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++    MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE
+   fi
+ 
+ 
+-# Check whether --with-gconf-source was given.
+-if test "${with_gconf_source+set}" = set; then :
+-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
++# Check whether --with-mateconf-source was given.
++if test "${with_mateconf_source+set}" = set; then :
++  withval=$with_mateconf_source; MATECONF_SCHEMA_CONFIG_SOURCE="$withval"
+ fi
+ 
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++$as_echo "Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+ 
+-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then
++    MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas'
+   fi
+ 
+ 
+-# Check whether --with-gconf-schema-file-dir was given.
+-if test "${with_gconf_schema_file_dir+set}" = set; then :
+-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
++# Check whether --with-mateconf-schema-file-dir was given.
++if test "${with_mateconf_schema_file_dir+set}" = set; then :
++  withval=$with_mateconf_schema_file_dir; MATECONF_SCHEMA_FILE_DIR="$withval"
+ fi
+ 
+ 
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++$as_echo "Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+ 
+   # Check whether --enable-schemas-install was given.
+ if test "${enable_schemas_install+set}" = set; then :
+@@ -13872,11 +13872,11 @@ if test "${enable_schemas_install+set}"
+ fi
+ 
+    if test "$enable_schemas_install" != no; then
+-  GCONF_SCHEMAS_INSTALL_TRUE=
+-  GCONF_SCHEMAS_INSTALL_FALSE='#'
++  MATECONF_SCHEMAS_INSTALL_TRUE=
++  MATECONF_SCHEMAS_INSTALL_FALSE='#'
+ else
+-  GCONF_SCHEMAS_INSTALL_TRUE='#'
+-  GCONF_SCHEMAS_INSTALL_FALSE=
++  MATECONF_SCHEMAS_INSTALL_TRUE='#'
++  MATECONF_SCHEMAS_INSTALL_FALSE=
+ fi
+ 
+ 
+@@ -13896,7 +13896,7 @@ $as_echo "#define USE_SCHEMAS 1" >>confd
+ 
+ fi
+ 
+-ac_config_files="$ac_config_files compiz-text.pc compiz-mousepoll.pc compiz-animation.pc data/Makefile data/filters/Makefile images/Makefile images/Oxygen/Makefile images/Gnome/Makefile Makefile metadata/Makefile include/Makefile src/Makefile src/animation/Makefile src/colorfilter/Makefile src/expo/Makefile src/ezoom/Makefile src/jpeg/Makefile src/kdecompat/Makefile src/mag/Makefile src/mousepoll/Makefile src/neg/Makefile src/opacify/Makefile src/put/Makefile src/resizeinfo/Makefile src/ring/Makefile src/scaleaddon/Makefile src/session/Makefile src/shift/Makefile src/snap/Makefile src/staticswitcher/Makefile src/text/Makefile src/thumbnail/Makefile src/titleinfo/Makefile src/vpswitch/Makefile src/wall/Makefile src/winrules/Makefile src/workarounds/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files compiz-text.pc compiz-mousepoll.pc compiz-animation.pc data/Makefile data/filters/Makefile images/Makefile images/Oxygen/Makefile images/Mate/Makefile Makefile metadata/Makefile include/Makefile src/Makefile src/animation/Makefile src/colorfilter/Makefile src/expo/Makefile src/ezoom/Makefile src/jpeg/Makefile src/kdecompat/Makefile src/mag/Makefile src/mousepoll/Makefile src/neg/Makefile src/opacify/Makefile src/put/Makefile src/resizeinfo/Makefile src/ring/Makefile src/scaleaddon/Makefile src/session/Makefile src/shift/Makefile src/snap/Makefile src/staticswitcher/Makefile src/text/Makefile src/thumbnail/Makefile src/titleinfo/Makefile src/vpswitch/Makefile src/wall/Makefile src/winrules/Makefile src/workarounds/Makefile po/Makefile.in"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -14045,8 +14045,8 @@ if test -z "${JPEG_PLUGIN_TRUE}" && test
+   as_fn_error $? "conditional \"JPEG_PLUGIN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++if test -z "${MATECONF_SCHEMAS_INSTALL_TRUE}" && test -z "${MATECONF_SCHEMAS_INSTALL_FALSE}"; then
++  as_fn_error $? "conditional \"MATECONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_SCHEMAS_TRUE}" && test -z "${USE_SCHEMAS_FALSE}"; then
+@@ -14923,7 +14923,7 @@ do
+     "data/filters/Makefile") CONFIG_FILES="$CONFIG_FILES data/filters/Makefile" ;;
+     "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
+     "images/Oxygen/Makefile") CONFIG_FILES="$CONFIG_FILES images/Oxygen/Makefile" ;;
+-    "images/Gnome/Makefile") CONFIG_FILES="$CONFIG_FILES images/Gnome/Makefile" ;;
++    "images/Mate/Makefile") CONFIG_FILES="$CONFIG_FILES images/Mate/Makefile" ;;
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "metadata/Makefile") CONFIG_FILES="$CONFIG_FILES metadata/Makefile" ;;
+     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+diff -upr compiz-plugins-main-0.8.8-orig/configure.ac compiz-plugins-main-0.8.8/configure.ac
+--- compiz-plugins-main-0.8.8-orig/configure.ac	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/configure.ac	2012-05-16 14:09:41.000000000 +0200
+@@ -158,29 +158,29 @@ if test "$use_jpeg" = yes; then
+ fi
+ 
+ AC_ARG_ENABLE(schemas,
+-  [  --enable-schemas         Build gconf schemas],
++  [  --enable-schemas         Build mateconf schemas],
+   [use_schemas=$enableval], [use_schemas=no])
+ 
+ if test x"$use_schemas" = x"yes"; then
+-  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-  PKG_CHECK_MODULES(SCHEMAS, compiz-gconf, [use_schemas=yes], [use_schemas=no])
+-  if test x"$GCONFTOOL" = xno; then
+-    AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no)
++  PKG_CHECK_MODULES(SCHEMAS, compiz-mateconf, [use_schemas=yes], [use_schemas=no])
++  if test x"$MATECONFTOOL" = xno; then
++    AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf])
+   fi
+   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+   if test x"$PKG_CONFIG" = xno ; then
+     AC_MSG_ERROR([pkg-config executable not found in your path, unable to determine schema directory])
+   fi
+-  xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
++  xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-mateconf`
+   AC_SUBST(xsltdir)
+ fi
+ 
+-AM_GCONF_SOURCE_2
++AM_MATECONF_SOURCE_2
+ 
+ 
+ AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
+ if test "$use_schemas" = yes; then
+-  AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])
++  AC_DEFINE(USE_SCHEMAS, 1, [Build mateconf schemas])
+ fi
+ 
+ AC_OUTPUT([
+@@ -191,7 +191,7 @@ data/Makefile
+ data/filters/Makefile
+ images/Makefile
+ images/Oxygen/Makefile
+-images/Gnome/Makefile
++images/Mate/Makefile
+ Makefile
+ metadata/Makefile
+ include/Makefile
+diff -upr compiz-plugins-main-0.8.8-orig/data/filters/Makefile.in compiz-plugins-main-0.8.8/data/filters/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/data/filters/Makefile.in	2011-04-21 13:41:55.000000000 +0200
++++ compiz-plugins-main-0.8.8/data/filters/Makefile.in	2012-05-16 14:09:41.000000000 +0200
+@@ -104,9 +104,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/data/Makefile.in compiz-plugins-main-0.8.8/data/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/data/Makefile.in	2011-04-21 13:41:55.000000000 +0200
++++ compiz-plugins-main-0.8.8/data/Makefile.in	2012-05-16 14:09:42.000000000 +0200
+@@ -120,9 +120,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/images/Makefile.am compiz-plugins-main-0.8.8/images/Makefile.am
+--- compiz-plugins-main-0.8.8-orig/images/Makefile.am	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/images/Makefile.am	2012-08-26 14:09:20.034929059 +0200
+@@ -1 +1,2 @@
+-SUBDIRS = Oxygen Gnome
+\ Kein Zeilenumbruch am Dateiende.
++SUBDIRS = Oxygen Mate
++
+diff -upr compiz-plugins-main-0.8.8-orig/images/Makefile.in compiz-plugins-main-0.8.8/images/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/images/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/images/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -120,9 +120,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+@@ -247,7 +247,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xsltdir = @xsltdir@
+-SUBDIRS = Oxygen Gnome
++SUBDIRS = Oxygen Mate
+ all: all-recursive
+ 
+ .SUFFIXES:
+diff -upr compiz-plugins-main-0.8.8-orig/images/Mate/Makefile.am compiz-plugins-main-0.8.8/images/Mate/Makefile.am
+--- compiz-plugins-main-0.8.8-orig/images/Mate/Makefile.am	2012-08-26 13:24:43.741502806 +0200
++++ compiz-plugins-main-0.8.8/images/Mate/Makefile.am	2012-05-16 14:09:39.000000000 +0200
+@@ -0,0 +1,8 @@
++imagesdir = $(imagedir)/Mate
++images_DATA =	       \
++	overlay.png \
++	mask.png
++
++EXTRA_DIST =	       \
++	overlay.png \
++	mask.png 
+diff -upr compiz-plugins-main-0.8.8-orig/images/Mate/Makefile.in compiz-plugins-main-0.8.8/images/Mate/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/images/Mate/Makefile.in	2012-08-26 13:24:58.534657209 +0200
++++ compiz-plugins-main-0.8.8/images/Mate/Makefile.in	2012-05-16 14:09:41.000000000 +0200
+@@ -0,0 +1,454 @@
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
++# Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++subdir = images/Mate
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__installdirs = "$(DESTDIR)$(imagesdir)"
++DATA = $(images_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++ALL_LINGUAS = @ALL_LINGUAS@
++AMTAR = @AMTAR@
++AR = @AR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++BCOP_BIN = @BCOP_BIN@
++BCOP_CFLAGS = @BCOP_CFLAGS@
++BCOP_LIBS = @BCOP_LIBS@
++CAIRO_CFLAGS = @CAIRO_CFLAGS@
++CAIRO_LIBS = @CAIRO_LIBS@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++COMPIZ_CFLAGS = @COMPIZ_CFLAGS@
++COMPIZ_LIBS = @COMPIZ_LIBS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DATADIRNAME = @DATADIRNAME@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GL_CFLAGS = @GL_CFLAGS@
++GL_LIBS = @GL_LIBS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GREP = @GREP@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLLIBS = @INTLLIBS@
++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
++INTLTOOL_MERGE = @INTLTOOL_MERGE@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
++LD = @LD@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LIPO = @LIPO@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PANGO_CFLAGS = @PANGO_CFLAGS@
++PANGO_LIBS = @PANGO_LIBS@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
++POFILES = @POFILES@
++POSUB = @POSUB@
++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++RANLIB = @RANLIB@
++SCALE_CFLAGS = @SCALE_CFLAGS@
++SCALE_LIBS = @SCALE_LIBS@
++SCHEMAS_CFLAGS = @SCHEMAS_CFLAGS@
++SCHEMAS_LIBS = @SCHEMAS_LIBS@
++SED = @SED@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++builddir = @builddir@
++compdatadir = @compdatadir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++imagedir = @imagedir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
++mandir = @mandir@
++metadatadir = @metadatadir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++plugindir = @plugindir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++xsltdir = @xsltdir@
++imagesdir = $(imagedir)/Mate
++images_DATA = \
++	overlay.png \
++	mask.png
++
++EXTRA_DIST = \
++	overlay.png \
++	mask.png 
++
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Mate/Makefile'; \
++	$(am__cd) $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu images/Mate/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++install-imagesDATA: $(images_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
++	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagesdir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \
++	done
++
++uninstall-imagesDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
++	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	test -n "$$files" || exit 0; \
++	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
++	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d "$(distdir)/$$file"; then \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
++	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++	  else \
++	    test -f "$(distdir)/$$file" \
++	    || cp -p $$d/$$file "$(distdir)/$$file" \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++	for dir in "$(DESTDIR)$(imagesdir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++html-am:
++
++info: info-am
++
++info-am:
++
++install-data-am: install-imagesDATA
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
++
++install-exec-am:
++
++install-html: install-html-am
++
++install-html-am:
++
++install-info: install-info-am
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-imagesDATA
++
++.MAKE: install-am install-strip
++
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-dvi install-dvi-am \
++	install-exec install-exec-am install-html install-html-am \
++	install-imagesDATA install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-imagesDATA
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -upr compiz-plugins-main-0.8.8-orig/images/Oxygen/Makefile.in compiz-plugins-main-0.8.8/images/Oxygen/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/images/Oxygen/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/images/Oxygen/Makefile.in	2012-05-16 14:09:42.000000000 +0200
+@@ -104,9 +104,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/include/Makefile.in compiz-plugins-main-0.8.8/include/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/include/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/include/Makefile.in	2012-05-16 14:09:41.000000000 +0200
+@@ -109,9 +109,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/Makefile.in compiz-plugins-main-0.8.8/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/Makefile.in	2012-05-16 14:09:45.000000000 +0200
+@@ -162,9 +162,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/animation.xml.in compiz-plugins-main-0.8.8/metadata/animation.xml.in
+--- compiz-plugins-main-0.8.8-orig/metadata/animation.xml.in	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/animation.xml.in	2012-05-16 14:09:44.000000000 +0200
+@@ -59,7 +59,7 @@
+ 	    <_long>The windows that will be animated.</_long>
+ 	    <type>match</type>
+ 	    <default>
+-	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
++	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=mate-screensaver)</value>
+ 	      <value>(type=Menu | PopupMenu | DropdownMenu)</value>
+ 	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
+ 	    </default>
+@@ -125,7 +125,7 @@
+ 	    <_long>The windows that will be animated.</_long>
+ 	    <type>match</type>
+ 	    <default>
+-	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
++	      <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=mate-screensaver)</value>
+ 	      <value>(type=Menu | PopupMenu | DropdownMenu)</value>
+ 	      <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
+ 	    </default>
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/mag.xml.in compiz-plugins-main-0.8.8/metadata/mag.xml.in
+--- compiz-plugins-main-0.8.8-orig/metadata/mag.xml.in	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/mag.xml.in	2012-05-16 14:09:40.000000000 +0200
+@@ -123,13 +123,13 @@
+ 						<_short>Magnifier image</_short>
+ 						<_long>Magnifier image.</_long>
+ 						<hints>file;image;</hints>
+-						<default>Gnome/overlay.png</default>
++						<default>Mate/overlay.png</default>
+ 					</option>
+ 					<option name="mask" type="string">
+ 						<_short>Clip mask</_short>
+ 						<_long>Clip mask.</_long>
+ 						<hints>file;image;</hints>
+-						<default>Gnome/mask.png</default>
++						<default>Mate/mask.png</default>
+ 					</option>
+ 					<option name="x_offset" type="int">
+ 						<_short>X offset of the cursor</_short>
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/Makefile.am compiz-plugins-main-0.8.8/metadata/Makefile.am
+--- compiz-plugins-main-0.8.8-orig/metadata/Makefile.am	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/Makefile.am	2012-05-16 14:09:39.000000000 +0200
+@@ -53,17 +53,17 @@ xml_DATA     = $(xml_files)
+ @INTLTOOL_XML_RULE@
+ 
+ if USE_SCHEMAS
+-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
++schemadir   = $(MATECONF_SCHEMA_FILE_DIR)
+ schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files))
+ schema_DATA  = $(schema_files)
+ 
+ %.schemas: $(xml_files)
+ 	xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml;
+ 
+-if GCONF_SCHEMAS_INSTALL
++if MATECONF_SCHEMAS_INSTALL
+ install-data-local:
+ 	if test -z "$(DESTDIR)" ; then \
+-               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \
++               MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \
+        fi
+ endif
+ endif
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/Makefile.in compiz-plugins-main-0.8.8/metadata/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/metadata/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/Makefile.in	2012-05-16 14:09:42.000000000 +0200
+@@ -104,9 +104,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+@@ -266,7 +266,7 @@ xml_in_files = \
+ 
+ xml_files = $(xml_in_files:.xml.in=.xml)
+ xml_DATA = $(xml_files)
+- at USE_SCHEMAS_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
++ at USE_SCHEMAS_TRUE@schemadir = $(MATECONF_SCHEMA_FILE_DIR)
+ @USE_SCHEMAS_TRUE at schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files))
+ @USE_SCHEMAS_TRUE at schema_DATA = $(schema_files)
+ EXTRA_DIST = \
+@@ -425,7 +425,7 @@ distclean-generic:
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+- at GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
++ at MATECONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+ @USE_SCHEMAS_FALSE at install-data-local:
+ clean: clean-am
+ 
+@@ -514,10 +514,10 @@ uninstall-am: uninstall-schemaDATA unins
+ @USE_SCHEMAS_TRUE@%.schemas: $(xml_files)
+ @USE_SCHEMAS_TRUE@	xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml;
+ 
+- at GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE at install-data-local:
+- at GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@	if test -z "$(DESTDIR)" ; then \
+- at GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \
+- at GCONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@       fi
++ at MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE at install-data-local:
++ at MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@	if test -z "$(DESTDIR)" ; then \
++ at MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@               MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \
++ at MATECONF_SCHEMAS_INSTALL_TRUE@@USE_SCHEMAS_TRUE@       fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/resizeinfo.xml.in compiz-plugins-main-0.8.8/metadata/resizeinfo.xml.in
+--- compiz-plugins-main-0.8.8-orig/metadata/resizeinfo.xml.in	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/resizeinfo.xml.in	2012-05-16 14:09:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ <compiz>
+   <plugin name="resizeinfo" useBcop="true">
+     <_short>Resize Info</_short>
+-    <_long>Display info on resize similar to metacity</_long>
++    <_long>Display info on resize similar to marco</_long>
+ 	<category>Utility</category>
+ 	<deps>
+ 		<relation type="after">
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/workarounds.xml.in compiz-plugins-main-0.8.8/metadata/workarounds.xml.in
+--- compiz-plugins-main-0.8.8-orig/metadata/workarounds.xml.in	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/metadata/workarounds.xml.in	2012-05-16 14:09:39.000000000 +0200
+@@ -6,7 +6,7 @@
+         <deps>
+         </deps>
+         <_short>Workarounds</_short>
+-        <_long>Metacity-like workarounds.</_long>
++        <_long>Marco-like workarounds.</_long>
+         <display>
+             <option type="bool" name="legacy_fullscreen">
+                 <_short>Legacy Fullscreen Support</_short>
+diff -upr compiz-plugins-main-0.8.8-orig/src/animation/animation.c compiz-plugins-main-0.8.8/src/animation/animation.c
+--- compiz-plugins-main-0.8.8-orig/src/animation/animation.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/animation/animation.c	2012-05-16 14:09:59.000000000 +0200
+@@ -4607,7 +4607,7 @@ static Bool animInitDisplay(CompPlugin *
+     matchInit (&ad->neverAnimateMatch);
+     matchAddExp (&ad->neverAnimateMatch, 0, "title=gksu");
+     matchAddExp (&ad->neverAnimateMatch, 0, "title=x-session-manager");
+-    matchAddExp (&ad->neverAnimateMatch, 0, "title=gnome-session");
++    matchAddExp (&ad->neverAnimateMatch, 0, "title=mate-session");
+     matchUpdate (d, &ad->neverAnimateMatch);
+ 
+     WRAP(ad, d, handleEvent, animHandleEvent);
+diff -upr compiz-plugins-main-0.8.8-orig/src/animation/Makefile.in compiz-plugins-main-0.8.8/src/animation/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/animation/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/animation/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/colorfilter/Makefile.in compiz-plugins-main-0.8.8/src/colorfilter/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/colorfilter/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/colorfilter/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/expo/Makefile.in compiz-plugins-main-0.8.8/src/expo/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/expo/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/expo/Makefile.in	2012-05-16 14:09:42.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/ezoom/Makefile.in compiz-plugins-main-0.8.8/src/ezoom/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/ezoom/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/ezoom/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/jpeg/Makefile.in compiz-plugins-main-0.8.8/src/jpeg/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/jpeg/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/jpeg/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -130,9 +130,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/kdecompat/Makefile.in compiz-plugins-main-0.8.8/src/kdecompat/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/kdecompat/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/kdecompat/Makefile.in	2012-05-16 14:09:42.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/mag/Makefile.in compiz-plugins-main-0.8.8/src/mag/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/mag/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/mag/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/Makefile.in compiz-plugins-main-0.8.8/src/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -120,9 +120,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/mousepoll/Makefile.in compiz-plugins-main-0.8.8/src/mousepoll/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/mousepoll/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/mousepoll/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -125,9 +125,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/neg/Makefile.in compiz-plugins-main-0.8.8/src/neg/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/neg/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/neg/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/opacify/Makefile.in compiz-plugins-main-0.8.8/src/opacify/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/opacify/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/opacify/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/put/Makefile.in compiz-plugins-main-0.8.8/src/put/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/put/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/put/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/resizeinfo/Makefile.in compiz-plugins-main-0.8.8/src/resizeinfo/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/resizeinfo/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/resizeinfo/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -132,9 +132,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/resizeinfo/resizeinfo.c compiz-plugins-main-0.8.8/src/resizeinfo/resizeinfo.c
+--- compiz-plugins-main-0.8.8-orig/src/resizeinfo/resizeinfo.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/resizeinfo/resizeinfo.c	2012-05-16 14:09:43.000000000 +0200
+@@ -1,6 +1,6 @@
+ /**
+  *
+- * Compiz metacity like info during resize
++ * Compiz marco like info during resize
+  *
+  * resizeinfo.c
+  *
+diff -upr compiz-plugins-main-0.8.8-orig/src/ring/Makefile.in compiz-plugins-main-0.8.8/src/ring/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/ring/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/ring/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/scaleaddon/Makefile.in compiz-plugins-main-0.8.8/src/scaleaddon/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/scaleaddon/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/scaleaddon/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -132,9 +132,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/session/Makefile.in compiz-plugins-main-0.8.8/src/session/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/session/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/session/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -125,9 +125,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/shift/Makefile.in compiz-plugins-main-0.8.8/src/shift/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/shift/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/shift/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/snap/Makefile.in compiz-plugins-main-0.8.8/src/snap/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/snap/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/snap/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -127,9 +127,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/staticswitcher/Makefile.in compiz-plugins-main-0.8.8/src/staticswitcher/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/staticswitcher/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/staticswitcher/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/text/Makefile.in compiz-plugins-main-0.8.8/src/text/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/text/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/text/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -129,9 +129,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/thumbnail/Makefile.in compiz-plugins-main-0.8.8/src/thumbnail/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/thumbnail/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/thumbnail/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/titleinfo/Makefile.in compiz-plugins-main-0.8.8/src/titleinfo/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/titleinfo/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/titleinfo/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/vpswitch/Makefile.in compiz-plugins-main-0.8.8/src/vpswitch/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/vpswitch/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/vpswitch/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/wall/Makefile.in compiz-plugins-main-0.8.8/src/wall/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/wall/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/wall/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -129,9 +129,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/winrules/Makefile.in compiz-plugins-main-0.8.8/src/winrules/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/winrules/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/winrules/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -125,9 +125,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/workarounds/Makefile.in compiz-plugins-main-0.8.8/src/workarounds/Makefile.in
+--- compiz-plugins-main-0.8.8-orig/src/workarounds/Makefile.in	2011-04-21 13:41:56.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/workarounds/Makefile.in	2012-05-16 14:09:43.000000000 +0200
+@@ -128,9 +128,9 @@ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FGREP = @FGREP@
+-GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
++MATECONFTOOL = @MATECONFTOOL@
++MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
++MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GL_CFLAGS = @GL_CFLAGS@
+ GL_LIBS = @GL_LIBS@
+diff -upr compiz-plugins-main-0.8.8-orig/src/workarounds/workarounds.c compiz-plugins-main-0.8.8/src/workarounds/workarounds.c
+--- compiz-plugins-main-0.8.8-orig/src/workarounds/workarounds.c	2011-04-21 12:20:09.000000000 +0200
++++ compiz-plugins-main-0.8.8/src/workarounds/workarounds.c	2012-05-16 14:09:44.000000000 +0200
+@@ -17,7 +17,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+- * This plug-in for Metacity-like workarounds.
++ * This plug-in for Marco-like workarounds.
+  */
+ 
+ #include <string.h>
diff --git a/compiz-plugins-main_plugin-matecompat.svg b/compiz-plugins-main_plugin-matecompat.svg
new file mode 100644
index 0000000..c5d3bf1
--- /dev/null
+++ b/compiz-plugins-main_plugin-matecompat.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3315"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   width="48"
+   height="48"
+   sodipodi:docname="mate.png">
+  <metadata
+     id="metadata3321">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3319" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3317"
+     showgrid="false"
+     inkscape:zoom="5.9375"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="587"
+     inkscape:window-y="157"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3315" />
+  <image
+     width="48"
+     height="48"
+     xlink:href="data:image/png;base64,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
+"
+     id="image3323"
+     x="0"
+     y="0" />
+</svg>
diff --git a/sources b/sources
new file mode 100644
index 0000000..5b097ab
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+337655a2c56266ac216c7dba5c4f0a05  compiz-plugins-main-0.8.8.tar.bz2


More information about the scm-commits mailing list