--- matchbox-window-manager-1.2.orig/debian/changelog
+++ matchbox-window-manager-1.2/debian/changelog
@@ -0,0 +1,77 @@
+matchbox-window-manager (1.2-1ubuntu1) gutsy; urgency=low
+
+  * Merge in lots of stuff from Maemo and upstream, enable window
+    animations. 
+  * Set ubuntu-mobile as the maintainer.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 03 Jul 2007 16:05:22 +0200
+
+matchbox-window-manager (1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Sun, 22 Apr 2007 12:40:45 +0100
+
+matchbox-window-manager (1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Sun, 15 Oct 2006 16:10:55 +0100
+
+matchbox-window-manager (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Sat, 11 Mar 2006 23:55:37 +0000
+
+matchbox-window-manager (0.9.5-2) unstable; urgency=low
+
+  * Tighten libmatchbox dependency, since the newer version should give this
+    package fewer direct dependencies.
+
+ -- Moray Allan <moray@debian.org>  Sun, 15 Jan 2006 12:24:58 +0000
+
+matchbox-window-manager (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Sun,  5 Jun 2005 19:59:09 +0100
+
+matchbox-window-manager (0.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Sun,  1 May 2005 18:11:14 +0100
+
+matchbox-window-manager (0.9.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Mon, 28 Mar 2005 20:23:54 +0100
+
+matchbox-window-manager (0.9-2) unstable; urgency=low
+
+  * Update watch file.
+  * Tighten libmatchbox-dev build-depends.
+
+ -- Moray Allan <moray@debian.org>  Mon, 10 Jan 2005 02:24:47 +0000
+
+matchbox-window-manager (0.9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Moray Allan <moray@debian.org>  Fri,  7 Jan 2005 16:56:11 +0000
+
+matchbox-window-manager (0.8.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Moray Allan <moray@debian.org>  Sat, 27 Nov 2004 19:15:45 +0000
+
+matchbox-window-manager (0.8.2-1) unstable; urgency=low
+
+  * Split out from monolithic matchbox package.
+  * New upstream release. Closes: #221365, #234223.
+  * New maintainer for Matchbox packages.
+
+ -- Moray Allan <moray@debian.org>  Fri, 16 Jul 2004 02:14:53 +0100
--- matchbox-window-manager-1.2.orig/debian/watch
+++ matchbox-window-manager-1.2/debian/watch
@@ -0,0 +1,4 @@
+version=2
+
+http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-(.*)\.tar.gz \
+	debian	uupdate
--- matchbox-window-manager-1.2.orig/debian/control
+++ matchbox-window-manager-1.2/debian/control
@@ -0,0 +1,18 @@
+Source: matchbox-window-manager
+Section: embedded
+Priority: optional
+Maintainer: Ubuntu Mobile Developers <ubuntu-mobile@lists.ubuntu.com>
+XSBC-Original-Maintainer: Moray Allan <moray@debian.org>
+Build-Depends: cdbs (>= 0.4.21), debhelper (>= 4.1.0), pkg-config, libstartup-notification0-dev, libmatchbox-dev (>= 1.8-1)
+Standards-Version: 3.7.2
+
+Package: matchbox-window-manager
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: matchbox (<< 1:0.8.2)
+Description: window manager for resource-limited systems
+ Matchbox is a base environment for the X Window System running on non-desktop
+ embedded platforms such as handhelds, set-top boxes, kiosks and anything else
+ for which screen space, input mechanisms or system resources are limited.
+ .
+ This package contains the Matchbox window manager.
--- matchbox-window-manager-1.2.orig/debian/compat
+++ matchbox-window-manager-1.2/debian/compat
@@ -0,0 +1 @@
+4
--- matchbox-window-manager-1.2.orig/debian/matchbox-remote.1
+++ matchbox-window-manager-1.2/debian/matchbox-remote.1
@@ -0,0 +1,77 @@
+.\" matchbox-remote.1
+.\" Copyright 2004  Moray Allan
+.TH matchbox-remote 1 "Jul 16 2004" ""
+.SH NAME
+matchbox-remote \- communicate with matchbox-window-manager process
+.SH SYNOPSIS
+.B matchbox-remote [options]
+.SH OPTIONS
+.TP
+\fB\-t\fR
+<matchbox theme name>  switch matchbox theme
+.TP
+\fB\-r\fR
+Print current matchbox theme to stdout
+.TP
+\fB\-exit\fR
+Request matchbox to exit
+.TP
+\fB\-next\fR
+Page to next window
+.TP
+\fB\-prev\fR
+Page to previous window
+.HP
+\fB\-desktop\fR Toggle desktop visibility
+.TP
+\fB\-mbmenu\fR
+Toggle mbmenu
+.TP
+\fB\-panel\-id\fR
+<int>
+.HP
+\fB\-panel\-toggle\fR
+.TP
+\fB\-h\fR
+help
+.TP
+\fB\-t\fR
+<matchbox theme name>  switch matchbox theme
+.TP
+\fB\-r\fR
+Print current matchbox theme to stdout
+.TP
+\fB\-exit\fR
+Request matchbox to exit
+.TP
+\fB\-next\fR
+Page to next window
+.TP
+\fB\-prev\fR
+Page to previous window
+.HP
+\fB\-desktop\fR Toggle desktop visibility
+.TP
+\fB\-mbmenu\fR
+Toggle mbmenu
+.TP
+\fB\-panel\-id\fR
+<int>
+.HP
+\fB\-panel\-toggle\fR
+.SH DESCRIPTION
+.B matchbox-remote
+connects to a running
+.B matchbox-window-manager
+process to get information about its state or send it instructions.
+
+.B matchbox-window-manager
+is a window manager for the X Window System running on non-desktop
+embedded platforms such as handhelds, set-top boxes, kiosks and anything else
+for which screen space, input mechanisms or system resources are limited.
+
+
+.SH AUTHOR
+.B matchbox-remote
+was written by Matthew Allum <mallum@o-hand.com>.
+
--- matchbox-window-manager-1.2.orig/debian/matchbox-window-manager.1
+++ matchbox-window-manager-1.2/debian/matchbox-window-manager.1
@@ -0,0 +1,38 @@
+.\" matchbox-window-manager.1
+.\" Copyright 2004  Moray Allan
+.TH matchbox-window-manager 1 "Jul 16 2004" ""
+.SH NAME
+matchbox-window-manager \- window manager for resource-limited systems
+.SH SYNOPSIS
+.B matchbox-window-manager [options]
+.SH OPTIONS
+.TP
+\fB\-display\fR
+<string>
+.TP
+\fB\-theme\fR
+<string>
+.TP
+\fB\-use_titlebar\fR
+<yes|no>
+.TP
+\fB\-use_cursor\fR
+<yes|no>
+.TP
+\fB\-use_lowlight\fR
+<yes|no>
+.TP
+\fB\-use_dialog_mode\fR
+<free|const|const-horiz>
+.HP
+\fB\-use_desktop_mode\fR <decorated|plain>
+.SH DESCRIPTION
+.B matchbox-window-manager
+is a window manager for the X Window System running on non-desktop
+embedded platforms such as handhelds, set-top boxes, kiosks and anything else
+for which screen space, input mechanisms or system resources are limited.
+
+.SH AUTHOR
+.B matchbox-window-manager
+was written by Matthew Allum <mallum@o-hand.com>.
+
--- matchbox-window-manager-1.2.orig/debian/matchbox-window-manager.manpages
+++ matchbox-window-manager-1.2/debian/matchbox-window-manager.manpages
@@ -0,0 +1,2 @@
+debian/matchbox-window-manager.1
+debian/matchbox-remote.1
--- matchbox-window-manager-1.2.orig/debian/rules
+++ matchbox-window-manager-1.2/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-startup-notification --enable-expat
+# --enable-gconf
--- matchbox-window-manager-1.2.orig/debian/copyright
+++ matchbox-window-manager-1.2/debian/copyright
@@ -0,0 +1,22 @@
+This package was debianised by Moray Allan <moray@debian.org> on
+Mon, 12 Jul 2004 20:39:00 +0100.
+
+It was downloaded from http://matchbox.handhelds.org/sources/
+
+Upstream author: Matthew Allum <mallum@o-hand.com>
+
+Copyright:
+
+   Copyright (C) 2004 Matthew Allum <mallum@o-hand.com>
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in '/usr/share/common-licenses/GPL-2'.
--- matchbox-window-manager-1.2.orig/data/schemas/Makefile.in
+++ matchbox-window-manager-1.2/data/schemas/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,8 +52,6 @@
 DATA = $(schema_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -77,22 +71,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +95,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,8 +112,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -134,9 +122,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -144,6 +134,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -167,8 +158,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = matchbox.schemas
 @GCONF_SCHEMAS_INSTALL_TRUE@schemadir = @GCONF_SCHEMA_FILE_DIR@
 @GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = matchbox.schemas
@@ -204,10 +198,9 @@
 	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
-uninstall-info-am:
 install-schemaDATA: $(schema_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)"
+	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
 	@list='$(schema_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -230,22 +223,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -261,7 +253,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(schemadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -308,12 +300,20 @@
 
 install-data-am: install-data-local install-schemaDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -332,17 +332,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-schemaDATA
+uninstall-am: uninstall-schemaDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-schemaDATA install-strip \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-schemaDATA install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-schemaDATA
+	pdf-am ps ps-am uninstall uninstall-am uninstall-schemaDATA
 
 
 @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--- matchbox-window-manager-1.2.orig/data/themes/MBOpus/Makefile.in
+++ matchbox-window-manager-1.2/data/themes/MBOpus/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,8 +52,6 @@
 DATA = $(themes_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -77,22 +71,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +95,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,8 +112,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -134,9 +122,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -144,6 +134,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -167,8 +158,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 pngs = panelbg.png closebutton.png
 themesdir = $(datadir)/themes/MBOpus/matchbox
 themes_DATA = theme.xml $(pngs) theme.desktop
@@ -205,10 +199,9 @@
 	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
-uninstall-info-am:
 install-themesDATA: $(themes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themesdir)" || $(mkdir_p) "$(DESTDIR)$(themesdir)"
+	test -z "$(themesdir)" || $(MKDIR_P) "$(DESTDIR)$(themesdir)"
 	@list='$(themes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -231,22 +224,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -262,7 +254,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(themesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -308,12 +300,20 @@
 
 install-data-am: install-themesDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -332,16 +332,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-themesDATA
+uninstall-am: uninstall-themesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-themesDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themesDATA
+	uninstall-am uninstall-themesDATA
 
 # 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.
--- matchbox-window-manager-1.2.orig/data/themes/blondie/Makefile.in
+++ matchbox-window-manager-1.2/data/themes/blondie/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,8 +52,6 @@
 DATA = $(themes_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -77,22 +71,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +95,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,8 +112,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -134,9 +122,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -144,6 +134,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -167,8 +158,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 pngs = close.png dialogbottomleft.png dialogbottomright.png               \
        dialogbottomtile.png dialogtopleft.png dialogtopright.png          \
        dialogtoptile.png menu.png next.png                                \
@@ -211,10 +205,9 @@
 	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
-uninstall-info-am:
 install-themesDATA: $(themes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themesdir)" || $(mkdir_p) "$(DESTDIR)$(themesdir)"
+	test -z "$(themesdir)" || $(MKDIR_P) "$(DESTDIR)$(themesdir)"
 	@list='$(themes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -237,22 +230,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -268,7 +260,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(themesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -314,12 +306,20 @@
 
 install-data-am: install-themesDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -338,16 +338,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-themesDATA
+uninstall-am: uninstall-themesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-themesDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themesDATA
+	uninstall-am uninstall-themesDATA
 
 # 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.
--- matchbox-window-manager-1.2.orig/data/themes/Default/theme.xml
+++ matchbox-window-manager-1.2/data/themes/Default/theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<theme name="Default" author="Matthew Allum - mallum@handhelds.org"
+<theme name="Default" author="Nokia"
        desc="" version="1.0" engine_version="1" >
 
 <color id="white" def="#ffffff" />
@@ -31,55 +31,37 @@
 <pixmap id="closebutton" filename="closebutton.xpm" />  
 <pixmap id="menubutton"  filename="menubutton.xpm" />  
 
-<frame id="main" height="20">
 
-  <layer x="0" y="0" w="100%"  h="100%" 
-   type="plain" color="borderdark" />
-
-  <layer x="1" y="1" w="100%-2"  h="1" 
-   type="plain" color="borderlight" />
-
-  <layer x="1" y="2" w="100%-2"  h="13" 
-   type="gradient-vert" startcol="grad1" endcol="grad2"/>
-
-  <layer x="1" y="2" w="100%-2"  h="17" 
-   type="plain" color="grad3"/>
 
-  <layer x="22" y="3" w="100%-44"  h="14" 
-   type="plain" color="menuhl"/>
+<!-- Main windows title bar. You need to define its height -->
+<frame id="main" height="60">
 
-  <layer x="22" y="3" w="1"  h="1" type="plain" color="grad3"/>
-  <layer x="22" y="16" w="1"  h="1" type="plain" color="grad3"/>
-  <layer x="100%-23" y="3" w="1"  h="1" type="plain" color="grad3"/>
-  <layer x="100%-23" y="16" w="1"  h="1" type="plain" color="grad3"/>
+  <layer x="0" y="0" w="720" h="60"
+     type="plain" color="borderdark"/>
 
-  <layer x="1" y="19" w="2"  h="1" 
-   type="plain" color="grad3" />
-
-  <layer x="100%-3" y="19" w="2"  h="1" 
-   type="plain" color="grad3" />
+  <layer x="35" y="12" w="283" h="30"
+     type="label" color="textcol" justify="left" font="titlefont" />
 
-  <!-- <layer x="6" y="2" w="16"  h="16" type="icon" />-->
+  <!-- Define the area that launches application menu -->
+  <button x="3" y="0" w="315" h="60" action="custom" options="inputonly,pressonly" />
 
-  <layer x="26" y="3" w="100%-60" h="20" 
-   type="label" color="textcol" justify="left" font="titlefont" />
+  <!-- Define the status bar applet panel -->
+  <panel x="-372" y="2" w="280" h="40" />
 
-
-  <button x="100%-20" y="0" w="16" h="20" action="close" >
-   <active pixmap="closebutton" blend="-150"/>
-   <inactive pixmap="closebutton" />
+  <!-- Define minimize and close buttons -->
+  <button x="-80" y="2" w="40" h="40" action="minimize" >
+    <active pixmap="closebutton" blend="-150"/>
+    <inactive pixmap="closebutton"/>
   </button>
 
-  <button x="4" y="0" w="16" h="20" action="menu" >
-   <active pixmap="menubutton" blend="-150"/>
-   <inactive pixmap="menubutton" />
+  <button x="-40" y="2" w="40" h="40" action="close" >
+    <active pixmap="menubutton" blend="-150" />
+    <inactive pixmap="menubutton"/>
   </button>
 
-  <button x="labelx" y="0" w="labelw" h="20" 
-   action="menu" options="inputonly" /> -
-
-</frame>
+  </frame>
 
+  <!--
 <frame id="main-east" width="4" >
 
   <layer x="0" y="0" w="100%"  h="100%" 
@@ -118,6 +100,7 @@
    type="plain" color="borderlight" />
 
 </frame>
+-->
 
 <frame id="dialog" height="20" >
 
@@ -261,7 +244,7 @@
 
 </frame>
 
-
+<!--
 <frame id="menu" 
         border_north="2" 
 	border_south="3" 
@@ -285,7 +268,7 @@
    type="plain" color="trans" />
 
 </frame>
-
+-->
 <shadow style="simple" dx="3" dy="3" color="shadowcol"/>
 
 </theme>
\ No newline at end of file
--- matchbox-window-manager-1.2.orig/data/themes/Default/Makefile.in
+++ matchbox-window-manager-1.2/data/themes/Default/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -56,8 +52,6 @@
 DATA = $(themes_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -77,22 +71,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,9 +95,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -122,8 +112,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -134,9 +122,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -144,6 +134,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -167,8 +158,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 pngs = acceptbutton.xpm  closebutton.xpm  menubutton.xpm
 themesdir = $(datadir)/themes/Default/matchbox
 themes_DATA = theme.xml $(pngs) theme.desktop
@@ -205,10 +199,9 @@
 	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
-uninstall-info-am:
 install-themesDATA: $(themes_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(themesdir)" || $(mkdir_p) "$(DESTDIR)$(themesdir)"
+	test -z "$(themesdir)" || $(MKDIR_P) "$(DESTDIR)$(themesdir)"
 	@list='$(themes_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -231,22 +224,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -262,7 +254,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(themesdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -308,12 +300,20 @@
 
 install-data-am: install-themesDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -332,16 +332,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-themesDATA
+uninstall-am: uninstall-themesDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip install-themesDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themesDATA
+	uninstall-am uninstall-themesDATA
 
 # 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.
--- matchbox-window-manager-1.2.orig/data/themes/Makefile.in
+++ matchbox-window-manager-1.2/data/themes/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,17 +42,18 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = blondie Default MBOpus
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -76,22 +73,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -103,9 +97,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -121,8 +114,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -133,9 +124,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -143,6 +136,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -166,8 +160,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 @WANT_STANDALONE_FALSE@SUBDIRS = blondie Default MBOpus
 @WANT_STANDALONE_TRUE@SUBDIRS = 
 all: all-recursive
@@ -202,7 +199,6 @@
 	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
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -235,8 +231,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -337,22 +332,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -366,7 +360,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -374,6 +368,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -427,12 +423,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -451,21 +455,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
 # 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.
--- matchbox-window-manager-1.2.orig/data/Makefile.in
+++ matchbox-window-manager-1.2/data/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,10 +43,11 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -61,13 +58,13 @@
 confDATA_INSTALL = $(INSTALL_DATA)
 defaultsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(conf_DATA) $(defaults_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = themes schemas
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -87,22 +84,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -114,9 +108,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -132,8 +125,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -144,9 +135,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -154,6 +147,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -177,8 +171,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 @ENABLE_SCHEMAS_FALSE@SUBDIRS = themes
 @ENABLE_SCHEMAS_TRUE@SUBDIRS = themes schemas
 confdir = $(sysconfdir)/matchbox
@@ -219,10 +216,9 @@
 	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
-uninstall-info-am:
 install-confDATA: $(conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
+	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
 	@list='$(conf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -239,7 +235,7 @@
 	done
 install-defaultsDATA: $(defaults_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(defaultsdir)" || $(mkdir_p) "$(DESTDIR)$(defaultsdir)"
+	test -z "$(defaultsdir)" || $(MKDIR_P) "$(DESTDIR)$(defaultsdir)"
 	@list='$(defaults_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -286,8 +282,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -388,22 +383,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -417,7 +411,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -425,6 +419,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -435,7 +431,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(confdir)" "$(DESTDIR)$(defaultsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -481,12 +477,20 @@
 
 install-data-am: install-confDATA install-defaultsDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -505,23 +509,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-confDATA uninstall-defaultsDATA \
-	uninstall-info-am
+uninstall-am: uninstall-confDATA uninstall-defaultsDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-confDATA install-data install-data-am \
-	install-defaultsDATA install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-defaultsDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-confDATA uninstall-defaultsDATA uninstall-info-am
+	uninstall-confDATA uninstall-defaultsDATA
 
 # 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.
--- matchbox-window-manager-1.2.orig/matchbox-window-manager.doap
+++ matchbox-window-manager-1.2/matchbox-window-manager.doap
@@ -0,0 +1,86 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	 xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	 xmlns="http://usefulinc.com/ns/doap#">
+
+	 <name>Matchbox Window Manager</name>
+	 <shortname>matchbox-window-manager</shortname>
+	 <created>2007-01-02</created>
+
+	 <shortdesc xml:lang="en">Matchbox Window Manager is an X11 window manager for non desktop platforms.</shortdesc>
+
+	 <description xml:lang="en"> 
+	 Matchbox Window Manager is an Open Source window manager for
+	 the X Window System targeted at non-desktop embedded platforms
+	 such as handhelds, set-top boxes, kiosks and anything else
+	 for which screen space, input mechanisms or system resources
+	 are limited.
+
+	 The window manager implements arestrictive stack based PDA
+	 like management policy. It supports modern window management
+	 standards, cutting edge X capabilities, advanced themeing and
+	 various window types.
+
+	</description>
+
+	<homepage rdf:resource="http://matchbox-project.org/" />
+        <download-page rdf:resource="http://matchbox-project.org/sources/" />
+	<license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
+
+        <bug-database rdf:resource="http://bugzilla.o-hand.com/enter_bug.cgi?product=matchbox-window-manager"/>
+
+        <os>linux</os>
+        <programming-language>C</programming-language>
+        <mailing-list rdf:resource="mailto:matchbox+subscribe@o-hand.com" />
+
+        <category rdf:resource="http://labs.o-hand.com/doap/category/embedded"/>
+        <category rdf:resource="http://labs.o-hand.com/doap/category/x11"/>
+        <category rdf:resource="http://labs.o-hand.com/doap/category/matchbox"/>
+	<maintainer>
+		<foaf:Person>
+			<foaf:name>Matthew Allum</foaf:name>
+			<foaf:mbox rdf:resource="mailto:mallum@o-hand.com"/>
+		</foaf:Person>
+	</maintainer>
+
+	<author>
+		<foaf:Person>
+			<foaf:name>Matthew Allum</foaf:name>
+                        <foaf:mbox rdf:resource="mailto:mallum@o-hand.com"/>
+		</foaf:Person>
+	</author>
+
+        <repository>
+		<SVNRepository>
+			<browse rdf:resource="http://svn.o-hand.com/view/matchbox/trunk/matchbox-window-manager"/>
+			<location rdf:resource="http://svn.o-hand.com/repos/matchbox/trunk/matchbox-window-manager"/>
+		</SVNRepository>
+        </repository>
+
+	<release>
+		<Version>
+			<name>matchbox-window-manager-1.1</name>
+			<created>2006-08-04</created>
+			<revision>1.1</revision>
+			<file-release rdf:resource="http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-1.1.tar.bz2" />
+		</Version>
+	</release>
+
+	<release>
+		<Version>
+			<name>matchbox-window-manager-1.0</name>
+			<created>2006-03-07</created>
+			<revision>1.0</revision>
+			<file-release rdf:resource="http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-1.0.tar.bz2" />
+		</Version>
+	</release>
+
+	<release>
+		<Version>
+			<name>matchbox-window-manager-0.9.3</name>
+			<created>2006-02-08</created>
+			<revision>0.9.3</revision>
+			<file-release rdf:resource="http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-0.9.3.tar.bz2" />
+		</Version>
+	</release>
+
+</Project>
\ No newline at end of file
--- matchbox-window-manager-1.2.orig/configure.ac
+++ matchbox-window-manager-1.2/configure.ac
@@ -33,6 +33,10 @@
   [  --enable-composite            enable composite support (EXPERIMENTAL).],
   enable_composite=$enableval, enable_composite=no)
 
+AC_ARG_ENABLE(frameanimation,
+  [  --enable-frameanimation            enable frame animation support (EXPERIMENTAL).],
+  enable_frameanimation=$enableval, enable_frameanimation=no)
+
 AC_ARG_ENABLE(startup_notification,
   [  --enable-startup-notification enable startup notification support],
      enable_startup_notification=$enableval, enable_startup_notification=no )
@@ -251,6 +255,12 @@
 
 fi
 
+dnl ------ Frame animation -------------------------------------------------
+
+if test x$enable_frameanimation != xno; then
+  AC_DEFINE(USE_FRAME_ANIMATION, [1], [use frame animation code])
+fi
+
 dnl ------ XFixes Curosr removal check ------------------------------------
 
 PKG_CHECK_MODULES(XFIXES, xfixes >= 4.0, have_xfixes=yes, have_xfixes=no)
@@ -529,6 +539,7 @@
         Building with GConf:                ${enable_gconf}
         Building with Session support:      ${enable_session}
         Building with Composite manager:    ${enable_composite}
+        Building with Frame animations:     ${enable_frameanimation}
 
 
 
--- matchbox-window-manager-1.2.orig/src/toolbar_client_alt.c
+++ matchbox-window-manager-1.2/src/toolbar_client_alt.c
@@ -29,6 +29,26 @@
 
 static int dialog_init_height;
 
+static void
+toolbar_client_set_input_area(Wm *w, Client *c)
+{
+  CARD32 val[4];
+
+  if(!c)
+    {
+      XDeleteProperty(w->dpy, w->root, w->atoms[_NET_INPUT_AREAS]);
+      return;
+    }
+
+  val[0] = c->x;
+  val[1] = c->y;
+  val[2] = c->width;
+  val[3] = c->height;
+  
+  XChangeProperty(w->dpy, w->root, w->atoms[_NET_INPUT_AREAS],
+                  XA_CARDINAL, 32, PropModeReplace, (unsigned char *)val, 4);
+}
+
 Client*
 toolbar_client_new(Wm *w, Window win)
 {
@@ -267,6 +287,7 @@
       
   dialog_client_show(c);
 
+  toolbar_client_set_input_area(w, c);
   c->mapped = True;
 }
 
@@ -330,6 +351,8 @@
     w->focused_client = NULL;
 
   base_client_destroy(c);     
+
+  toolbar_client_set_input_area(w, NULL);
 }
 
 
--- matchbox-window-manager-1.2.orig/src/dialog_client.c
+++ matchbox-window-manager-1.2/src/dialog_client.c
@@ -502,6 +502,13 @@
 	if (p->type == MBCLIENT_TYPE_TOOLBAR && p->mapped 
 	    && !(p->flags & CLIENT_IS_MINIMIZED))
 	  { have_toolbar = True; break; }
+#ifdef USE_ALT_INPUT_WIN
+	 if (p->flags & (CLIENT_TB_ALT_TRANS_FOR_DIALOG))
+	   {
+	     have_toolbar = True;
+	     break;
+	   }
+#endif
       }
 
       *y = wm_get_offsets_size(w, NORTH, NULL, True);
--- matchbox-window-manager-1.2.orig/src/base_client.c
+++ matchbox-window-manager-1.2/src/base_client.c
@@ -96,6 +96,9 @@
    c->width  = attr.width;
    c->height = attr.height;
 
+   if (c->x < 0) c->x = (w->dpy_width + c->x - c->width); 	 
+   if (c->y < 0) c->y = (w->dpy_height + c->y - c->height);
+   
    c->gravity = NorthWestGravity;
 
    if (XGetWMNormalHints(w->dpy, c->window, &sz_hints, &mask))
@@ -291,10 +294,11 @@
    */
 
   XTextProperty  text_prop;
+/* Patching away window numbering - Tapani 24.4.2006
   Client        *p = NULL; 
   int            i, max = 0; 
   char          *tmp_name = NULL;
-
+*/
   dbg("%s() called, name is %s\n", __func__, c->name);
    
   if (c->name == NULL)
@@ -334,7 +338,7 @@
     }
   
   /* If window name already exists, rename, adding <%i> to it if app window */
-
+/* Patching away window numbering - Tapani 24.4.2006
   if (!stack_empty(w) && c->type == MBCLIENT_TYPE_APP)
     {
       stack_enumerate(w, p)
@@ -366,7 +370,7 @@
 	  XFetchName(w->dpy, c->window, (char **)&c->name);
 	}
     }
-
+*/
    dbg("%s() end, name is now %s\n", __func__, c->name);
 }
 
--- matchbox-window-manager-1.2.orig/src/client_common.c
+++ matchbox-window-manager-1.2/src/client_common.c
@@ -824,7 +824,7 @@
 	 XUngrabPointer(w->dpy, CurrentTime); 
 
 	 client_deliver_message(c, w->atoms[MB_GRAB_TRANSFER],
-				CurrentTime, e->subwindow, 0, 0, 0);
+				e->time, e->subwindow, e->button, 0, 0);
 	 return button_item->id;
        }
 
--- matchbox-window-manager-1.2.orig/src/wm.c
+++ matchbox-window-manager-1.2/src/wm.c
@@ -1017,13 +1017,21 @@
        if (w->focused_client
            && c != w->focused_client
            && w->focused_client->type == MBCLIENT_TYPE_DIALOG
-           && w->focused_client->trans == c
            && w->focused_client->flags & CLIENT_IS_MODAL_FLAG)
          {
-           XAllowEvents(w->dpy, ReplayPointer, CurrentTime);
-           return;
-         }
+	   Client *trans = w->focused_client->trans;
+
+	   /* Burrow down transient list */
+	   while (trans != NULL && trans != c)
+	     trans = trans->trans;
 
+	   if (trans == c)
+	     {
+	       XAllowEvents(w->dpy, ReplayPointer, CurrentTime);
+	       return;
+	     }
+         }
+	     
        if (c->type == MBCLIENT_TYPE_DIALOG 
 	   && w->config->dialog_stratergy != WM_DIALOGS_STRATERGY_STATIC)
 	 {
@@ -1554,7 +1562,47 @@
 
 		 if (trans_client)
 		   {
-		     trans_client->height += diff;
+		     if (trans_client->type == MBCLIENT_TYPE_DIALOG)
+		       {
+			 /* do not grow over their initial size
+			    because of IM resizing smaller */
+			 if (trans_client->height + diff > trans_client->init_height)
+			   {
+			     trans_client->height = trans_client->init_height;
+			   }
+
+			 else
+			   {
+			     /* resize dialog */
+			     if (diff < 0)
+			       {
+				 int x, y, w, h;
+				 trans_client->get_coverage(trans_client, &x, &y, &w, &h);
+
+				 if (c->y < y+h)
+				   {
+				     int amount = (y+h) - c->y;
+
+				     /* move upwards */
+				     trans_client->y -= amount;
+
+				     /* but not over screen area */
+				     if (y-amount < 0)
+				       {
+					 trans_client->height -= amount-y;
+					 trans_client->y += amount-y;
+				       }
+				   }
+			       }
+			   }
+		       }
+
+		     else
+		       {
+			 /* resize application window */
+			 trans_client->height += diff;
+		       }
+
 		     trans_client->move_resize(trans_client);
 		     trans_client->redraw(trans_client, False);
 		   }
@@ -2094,6 +2142,12 @@
       else if (c->type == MBCLIENT_TYPE_DIALOG) /* already exists, update  */
 	c->trans = t;  		/* TODO: what about other types 
 				         being transient for things ?*/
+
+      /* Make sure above state is inherited if parent has it */
+      if (c->trans != NULL
+	  && c->trans->type == MBCLIENT_TYPE_DIALOG 
+	  && c->trans->flags & CLIENT_HAS_ABOVE_STATE)
+	c->flags |= CLIENT_HAS_ABOVE_STATE;
    }
    
    if (c == NULL) /* Noting else found, default to a main client */
@@ -2796,7 +2850,7 @@
       return w->stack_top_app;
     }
  
-  dbg("%s() returning NULL\n", __func__); 
+  dbg("%s() returni%s() calledng NULL\n", __func__); 
 
   return NULL;
 }
--- matchbox-window-manager-1.2.orig/src/ewmh.c
+++ matchbox-window-manager-1.2/src/ewmh.c
@@ -70,9 +70,10 @@
     "_NET_CURRENT_DESKTOP",
     "_NET_WM_DESKTOP",
     "_NET_WM_ICON",
+    "_NET_WM_ICON_GEOMETRY",
     "_NET_DESKTOP_GEOMETRY",
     "_NET_WORKAREA",
-  
+    "_NET_INPUT_AREAS",
     "_NET_SHOWING_DESKTOP",
   
     "_MOTIF_WM_HINTS",
@@ -455,7 +456,7 @@
   if (w->config->super_modal)
     XChangeProperty(w->dpy, w->root, w->atoms[_MB_NUM_MODAL_WINDOWS_PRESENT],
 		    XA_CARDINAL, 32, PropModeReplace,
-		    (unsigned char *)&w->n_modals_present, 1);
+		    (unsigned char *)&w->n_modal_blocker_wins, 1);
 }
 
 void
@@ -906,6 +907,32 @@
   return NULL;  /* XXX check this value is correctly Xfree'd  */
 }
 
+int*
+ewmh_get_icon_geometry (Wm *w, Window win)
+{
+  Atom           type;
+  int            format, result;
+  unsigned long  bytes_after, n_items;
+  unsigned char *data = NULL;
+
+  misc_trap_xerrors();
+
+  result =  XGetWindowProperty (w->dpy, win, w->atoms[_NET_WM_ICON_GEOMETRY],
+				0, 100000L,
+				False, XA_CARDINAL,
+				&type, &format, &n_items,
+				&bytes_after, (unsigned char **)&data);
+
+  if (misc_untrap_xerrors() || result != Success || data == NULL)
+    {
+      if (data) XFree (data);
+      return NULL;
+    }
+
+  return (int *)data;
+}
+
+
 #ifndef REDUCE_BLOAT
 
 int*
--- matchbox-window-manager-1.2.orig/src/structs.h
+++ matchbox-window-manager-1.2/src/structs.h
@@ -79,6 +79,16 @@
 #include <X11/SM/SMlib.h>
 #endif
 
+#ifdef USE_FRAME_ANIMATION
+enum
+  {
+    MB_FRAME_ANIMATION_CLOSE = 0,
+    MB_FRAME_ANIMATION_MINIMIZE,
+    MB_FRAME_ANIMATION_MAXIMIZE,
+    MB_FRAME_ANIMATION_TYPES
+  };
+#endif
+
 #define GENERIC_ICON        PKGDATADIR "/mbnoapp.xpm"
 
 #ifdef MB_HAVE_PNG
@@ -180,8 +190,10 @@
   _NET_CURRENT_DESKTOP,
   _NET_WM_DESKTOP,
   _NET_WM_ICON,
+  _NET_WM_ICON_GEOMETRY,
   _NET_DESKTOP_GEOMETRY,
   _NET_WORKAREA,
+  _NET_INPUT_AREAS,
   _NET_SHOW_DESKTOP,
   _MOTIF_WM_HINTS,
   _NET_WM_CONTEXT_HELP,
@@ -487,6 +499,12 @@
   WM_DIALOGS_STRATERGY_FREE,
 };
 
+typedef struct _mb_frame_animation
+{
+  XRectangle src;
+  XRectangle dst;
+} MBFrameAnimation;
+
 typedef struct _wm_config
 {
   char        *theme;
@@ -509,6 +527,11 @@
   unsigned char shadow_color[4];
 
 #endif
+
+#ifdef USE_FRAME_ANIMATION
+  Bool         use_frame_animation;
+  MBFrameAnimation animations[MB_FRAME_ANIMATION_TYPES];
+#endif
    
   Time         dbl_click_time;
   int          use_icons;
--- matchbox-window-manager-1.2.orig/src/main_client.c
+++ matchbox-window-manager-1.2/src/main_client.c
@@ -18,6 +18,7 @@
  *
  */
 #include "main_client.h"
+#include <libmb/mbutil.h>
 
 Client*
 main_client_new(Wm *w, Window win)
@@ -593,6 +594,8 @@
   int     ch = 0, offset_east = 0, offset_west = 0, total_w = 0;
   Client *p  = NULL;
 
+  dbg("%s called for %s\n", __func__, c->name);
+
    if (!w->config->use_title) return;
 
    if (w->flags & TITLE_HIDDEN_FLAG)
@@ -651,7 +654,50 @@
 	 wm_toggle_desktop(w);
 	 break;
       case BUTTON_ACTION_CLOSE:
-	 client_deliver_delete(c);
+#ifdef USE_FRAME_ANIMATION
+	if (w->config->use_frame_animation)
+	  {
+	    XRectangle *dst;
+	    XRectangle close;
+	    MBThemeFrame *frame;
+	    MBThemeButton *button;
+
+	    dst = &c->wm->config->animations[MB_FRAME_ANIMATION_CLOSE].dst;
+
+	    frame = (MBThemeFrame*)list_find_by_id(w->mbtheme->frames, FRAME_MAIN);
+	    if (frame)
+	      {
+		button = (MBThemeButton *)list_find_by_id(frame->buttons,
+							  BUTTON_ACTION_CLOSE);
+		if (button)
+		  {
+		    /* TODO - this should be 'finetuned' from theme
+		       since 'x does always mark the spot' ---
+		       use window coordinates and then mark offset values
+		       to theme! */
+
+		    close.x = c->x +
+		      theme_frame_button_get_x_pos (c->wm->mbtheme,
+						    FRAME_MAIN,
+						    BUTTON_ACTION_CLOSE,
+						    w->stack_top_app->width) +
+		      button->w->value / 2;
+
+		    close.y = c->wm->config->animations[MB_FRAME_ANIMATION_CLOSE].dst.y;
+		    close.width  = 1;
+		    close.height = 1;
+
+		    dst = &close;
+		  }
+	      }
+
+	    mb_util_frame_animation(c->wm->dpy,
+				    &c->wm->config->animations[MB_FRAME_ANIMATION_CLOSE].src,
+				    dst);
+	  }
+#endif
+	XSync(c->wm->dpy, True);
+	client_deliver_delete(c);
 	 break;
       case BUTTON_ACTION_NEXT:
 	wm_activate_client(stack_cycle_backward(w, MBCLIENT_TYPE_APP));
@@ -771,7 +817,6 @@
 {
   Wm *w = c->wm;
   Client *p = NULL;
-
   dbg("%s() called on %s\n", __func__, c->name);
 
   client_set_state(c, IconicState);
@@ -782,6 +827,32 @@
     if (p->trans == c)
       p->iconize(p);
 
+#ifdef USE_FRAME_ANIMATION
+  if (w->config->use_frame_animation)
+    {
+      int *geometry = ewmh_get_icon_geometry(c->wm, c->window);
+      XRectangle icon_geometry;
+      XRectangle *dst;
+
+      dst = &c->wm->config->animations[MB_FRAME_ANIMATION_MINIMIZE].dst;
+
+      if (geometry)
+	{
+	  icon_geometry.x      = geometry[0];
+	  icon_geometry.y      = geometry[1];
+	  icon_geometry.width  = geometry[2];
+	  icon_geometry.height = geometry[3];
+
+	  dst = &icon_geometry;
+
+	  free (geometry);
+	}
+      mb_util_frame_animation(c->wm->dpy,
+			      &c->wm->config->animations[MB_FRAME_ANIMATION_MINIMIZE].src,
+			      dst);
+    }
+#endif
+
   main_client_unmap(c);
 }
 
@@ -826,6 +897,32 @@
 	 {
 	   Client *p = NULL;
 
+#ifdef USE_FRAME_ANIMATION
+	   if (w->config->use_frame_animation)
+	     {
+	       int *geometry = ewmh_get_icon_geometry(c->wm, c->window);
+	       XRectangle icon_geometry;
+	       XRectangle *src;
+
+	       src = &c->wm->config->animations[MB_FRAME_ANIMATION_MAXIMIZE].src;
+
+	       if (geometry)
+		 {
+		   icon_geometry.x      = geometry[0];
+		   icon_geometry.y      = geometry[1];
+		   icon_geometry.width  = geometry[2];
+		   icon_geometry.height = geometry[3];
+
+		   src = &icon_geometry;
+
+		   free (geometry);
+		 }
+	       mb_util_frame_animation(c->wm->dpy,
+				       src,
+				       &c->wm->config->animations[MB_FRAME_ANIMATION_MAXIMIZE].dst);
+	     }
+#endif
+
 	   /* Reset state from Iconized */
 	   client_set_state(c, NormalState);
 	   c->flags &= ~CLIENT_IS_MINIMIZED;
@@ -935,11 +1032,11 @@
 void
 main_client_destroy(Client *c)
 {
-   dbg("%s called for %s\n", __func__, c->name);
-  
-   main_client_unmap(c);
+  dbg("%s called for %s\n", __func__, c->name);
+
+  main_client_unmap(c);
 
-   base_client_destroy(c); 
+  base_client_destroy(c); 
 }
 
 
--- matchbox-window-manager-1.2.orig/src/ewmh.h
+++ matchbox-window-manager-1.2/src/ewmh.h
@@ -25,10 +25,10 @@
 #include "wm.h"
 
  /* Number of failed pending pings to kill a ping supporting app on */
-#define PING_PENDING_MAX 2 
+#define PING_PENDING_MAX 3 
 
  /* Time in seconds between each hung app check */
-#define PING_CHECK_FREQ  2 
+#define PING_CHECK_FREQ  4 
 
 /* Max num of pings to send to an app - used only when in aggresive mode */
 #define PING_CHECK_DURATION 5
@@ -86,6 +86,9 @@
 void 
 ewmh_hung_app_check (Wm *w);
 
+int*
+ewmh_get_icon_geometry (Wm *w, Window win);
+
 #ifndef REDUCE_BLOAT
 int 
 *ewmh_get_icon_prop_data (Wm *w, Window win);
--- matchbox-window-manager-1.2.orig/src/Makefile.in
+++ matchbox-window-manager-1.2/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -78,7 +74,7 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -93,8 +89,6 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -114,22 +108,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -141,9 +132,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -159,8 +149,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -171,9 +159,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -181,6 +171,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -204,8 +195,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = \
   mbtheme-standalone.c mbtheme-standalone.h mbtheme.c mbtheme.h xml.c xml.h
 
@@ -274,7 +268,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -297,10 +291,10 @@
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 matchbox-remote$(EXEEXT): $(matchbox_remote_OBJECTS) $(matchbox_remote_DEPENDENCIES) 
 	@rm -f matchbox-remote$(EXEEXT)
-	$(LINK) $(matchbox_remote_LDFLAGS) $(matchbox_remote_OBJECTS) $(matchbox_remote_LDADD) $(LIBS)
+	$(LINK) $(matchbox_remote_OBJECTS) $(matchbox_remote_LDADD) $(LIBS)
 matchbox-window-manager$(EXEEXT): $(matchbox_window_manager_OBJECTS) $(matchbox_window_manager_DEPENDENCIES) 
 	@rm -f matchbox-window-manager$(EXEEXT)
-	$(LINK) $(matchbox_window_manager_LDFLAGS) $(matchbox_window_manager_OBJECTS) $(matchbox_window_manager_LDADD) $(LIBS)
+	$(LINK) $(matchbox_window_manager_OBJECTS) $(matchbox_window_manager_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -332,19 +326,18 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -395,22 +388,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -426,7 +418,7 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -474,12 +466,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -499,18 +499,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-local ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	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-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	uninstall-am uninstall-binPROGRAMS
 
 
 clean-local:
--- matchbox-window-manager-1.2.orig/src/mbtheme.c
+++ matchbox-window-manager-1.2/src/mbtheme.c
@@ -2126,6 +2126,69 @@
   return 1;
 }
 
+#ifdef USE_FRAME_ANIMATION
+static int
+parse_rectangle (const char *str, XRectangle *dst)
+{
+  if (sscanf (str,
+	      "%hd %hd %hd %hd",
+	      &dst->x, &dst->y,
+	      &dst->width, &dst->height) == 4)
+    {
+      return 1;
+    }
+  return -1;
+}
+
+static int
+parse_frame_animation_tag (MBTheme *theme,
+			   XMLNode *node)
+{
+  char *anim_id  = get_attr(node, "id");
+  char *src_rect = get_attr(node, "src");
+  char *dst_rect = get_attr(node, "dst");
+
+  if (anim_id && src_rect && dst_rect)
+    {
+      dbg ("parsing animation for '%s'\n", anim_id);
+
+      if (!strncmp(anim_id, "close", 5))
+	{
+	  if (!parse_rectangle(src_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_CLOSE].src))
+	    return ERROR_INCORRECT_PARAMS;
+	  if (!parse_rectangle(dst_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_CLOSE].dst))
+	    return ERROR_INCORRECT_PARAMS;
+	}
+      else if (!strncmp(anim_id, "minimize", 8))
+	{
+	  if (!parse_rectangle(src_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_MINIMIZE].src))
+	    return ERROR_INCORRECT_PARAMS;
+	  if (!parse_rectangle(dst_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_MINIMIZE].dst))
+	    return ERROR_INCORRECT_PARAMS;
+	}
+      else if (!strncmp(anim_id, "maximize", 8))
+	{
+	  if (!parse_rectangle(src_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_MAXIMIZE].src))
+	    return ERROR_INCORRECT_PARAMS;
+	  if (!parse_rectangle(dst_rect,
+			       &theme->wm->config->animations[MB_FRAME_ANIMATION_MAXIMIZE].dst))
+	    return ERROR_INCORRECT_PARAMS;
+	}
+      else
+	{
+	  return ERROR_INCORRECT_PARAMS;
+	}
+    }
+  else return ERROR_MISSING_PARAMS;
+
+  return 1;
+}
+#endif
 
 #ifdef USE_COMPOSITE
 static int
@@ -2442,6 +2505,7 @@
   int err = 0;
   XMLNode *root_node, *cnode;
   Nlist *n;
+  int k;
 
   XMLParser *parser = xml_parser_new();
 
@@ -2499,6 +2563,14 @@
 
   comp_engine_set_defualts(w);
 
+#ifdef USE_FRAME_ANIMATION
+  w->config->use_frame_animation=0;
+  for (k=0; k<MB_FRAME_ANIMATION_TYPES; k++)
+    {
+      memset (&w->config->animations[k], 0, sizeof(MBFrameAnimation));
+    }
+#endif
+
   root_node = xml_parse_file_dom(parser, theme_filename);
 
   if (root_node == NULL)
@@ -2603,7 +2675,19 @@
 	  }
 	 continue;
       }
-
+#ifdef USE_FRAME_ANIMATION
+      if (!strcmp("frame-animation", cnode->tag))
+      {
+	if ((err =parse_frame_animation_tag(w->mbtheme, cnode)) < 0)
+	  {
+	    show_parse_error(w, cnode, theme_filename, err);
+	    xml_parser_free(parser, root_node); 
+	    return mbtheme_init (w, NULL); 
+	  }
+	w->config->use_frame_animation=1;
+	continue;
+      }
+#endif
 #ifdef USE_COMPOSITE
       if (!strcmp("shadow", cnode->tag))
       {
--- matchbox-window-manager-1.2.orig/ChangeLog
+++ matchbox-window-manager-1.2/ChangeLog
@@ -1,3 +1,15 @@
+2007-04-23  Matthew Allum  <mallum@openedhand.com>
+
+	* src/wm.c: (wm_make_new_client):
+	Make sure dialog ABOVE state is inherited. (via Tapani)
+
+2007-04-13  =============== 1.2 Release. =====================
+
+2007-04-13  Matthew Allum  <mallum@openedhand.com>
+
+	* configure.ac:
+	Bump up for 1.2 release
+
 2007-03-19  Matthew Allum  <mallum@openedhand.com>
 
 	* src/ewmh.c: (ewmh_init):
--- matchbox-window-manager-1.2.orig/aclocal.m4
+++ matchbox-window-manager-1.2/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file 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.
@@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
 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
@@ -199,7 +204,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -209,7 +214,7 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -219,14 +224,29 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -283,14 +303,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -299,8 +319,10 @@
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -314,15 +336,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -350,6 +371,7 @@
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -415,6 +437,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -467,7 +490,8 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -492,8 +516,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -552,8 +577,8 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -576,16 +601,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -605,6 +634,9 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -640,6 +672,10 @@
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -675,7 +711,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -782,14 +818,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -805,6 +841,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -815,7 +852,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -823,60 +860,23 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -988,9 +988,21 @@
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--- matchbox-window-manager-1.2.orig/config.h.in
+++ matchbox-window-manager-1.2/config.h.in
@@ -114,6 +114,9 @@
 /* Use Expat XML Parser */
 #undef USE_EXPAT
 
+/* use frame animation code */
+#undef USE_FRAME_ANIMATION
+
 /* Has GConf Support */
 #undef USE_GCONF
 
--- matchbox-window-manager-1.2.orig/Makefile.in
+++ matchbox-window-manager-1.2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -43,7 +39,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -51,10 +47,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -70,8 +69,6 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -91,22 +88,19 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_SCHEMAS_FALSE = @ENABLE_SCHEMAS_FALSE@
-ENABLE_SCHEMAS_TRUE = @ENABLE_SCHEMAS_TRUE@
 EXEEXT = @EXEEXT@
 EXPAT_CFLAGS = @EXPAT_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 GCONFTOOL = @GCONFTOOL@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GCONF_SCHEMA_SUBDIRS = @GCONF_SCHEMA_SUBDIRS@
 GREP = @GREP@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -118,9 +112,8 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -136,8 +129,6 @@
 SN_LIBS = @SN_LIBS@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WANT_STANDALONE_FALSE = @WANT_STANDALONE_FALSE@
-WANT_STANDALONE_TRUE = @WANT_STANDALONE_TRUE@
 XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
 XCURSOR_LIBS = @XCURSOR_LIBS@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
@@ -148,9 +139,11 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+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@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -158,6 +151,7 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -181,8 +175,11 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = src data 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -225,7 +222,7 @@
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -238,7 +235,6 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -271,8 +267,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -374,23 +369,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -404,7 +398,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -412,6 +406,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -419,7 +415,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -494,7 +490,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -563,12 +559,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -589,24 +593,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-recursive distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-tags distcleancheck \
+	distdir distuninstallcheck 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-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 snapshot:
--- matchbox-window-manager-1.2.orig/configure
+++ matchbox-window-manager-1.2/configure
@@ -655,6 +655,7 @@
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -1340,6 +1341,7 @@
   --enable-standalone-xft       enable standalone build ( with Xft font), default=no
   --enable-standalone           enable standalone build.
   --enable-composite            enable composite support (EXPERIMENTAL).
+  --enable-frameanimation            enable frame animation support (EXPERIMENTAL).
   --enable-startup-notification enable startup notification support
   --enable-expat                enable expat XML parser support
   --enable-gconf                enable gconf support
@@ -1825,7 +1827,8 @@
 
 
 
-am__api_version="1.9"
+am__api_version='1.10'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -2008,38 +2011,53 @@
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
@@ -2122,12 +2140,16 @@
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -2170,7 +2192,7 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2274,7 +2296,7 @@
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -2299,9 +2321,7 @@
 
   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -3287,9 +3307,7 @@
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3299,7 +3317,6 @@
 
 
 
-
 depcc="$CC"   am_compiler_list=
 
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3367,6 +3384,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3396,9 +3414,7 @@
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4294,6 +4310,14 @@
 fi
 
 
+# Check whether --enable-frameanimation was given.
+if test "${enable_frameanimation+set}" = set; then
+  enableval=$enable_frameanimation; enable_frameanimation=$enableval
+else
+  enable_frameanimation=no
+fi
+
+
 # Check whether --enable-startup_notification was given.
 if test "${enable_startup_notification+set}" = set; then
   enableval=$enable_startup_notification; enable_startup_notification=$enableval
@@ -6099,9 +6123,7 @@
 
 fi
 
-
-
-if test x$enable_standalone = xyes || test x$enable_standalone_xft = xyes; then
+ if test x$enable_standalone = xyes || test x$enable_standalone_xft = xyes; then
   WANT_STANDALONE_TRUE=
   WANT_STANDALONE_FALSE='#'
 else
@@ -6379,6 +6401,15 @@
 fi
 
 
+if test x$enable_frameanimation != xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_FRAME_ANIMATION 1
+_ACEOF
+
+fi
+
+
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for XFIXES" >&5
@@ -7263,9 +7294,7 @@
       esac
 fi
 
-
-
-if test "$enable_schemas_install" != no; then
+   if test "$enable_schemas_install" != no; then
   GCONF_SCHEMAS_INSTALL_TRUE=
   GCONF_SCHEMAS_INSTALL_FALSE='#'
 else
@@ -7275,9 +7304,7 @@
 
 
 
-
-
-if test x$enable_gconf != xno; then
+ if test x$enable_gconf != xno; then
   ENABLE_SCHEMAS_TRUE=
   ENABLE_SCHEMAS_FALSE='#'
 else
@@ -9037,6 +9064,7 @@
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9251,6 +9279,7 @@
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -9307,7 +9336,6 @@
 XFIXES_CFLAGS!$XFIXES_CFLAGS$ac_delim
 XFIXES_LIBS!$XFIXES_LIBS$ac_delim
 XCURSOR_CFLAGS!$XCURSOR_CFLAGS$ac_delim
-XCURSOR_LIBS!$XCURSOR_LIBS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -9349,6 +9377,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+XCURSOR_LIBS!$XCURSOR_LIBS$ac_delim
 HAVE_XMLPARSE_H!$HAVE_XMLPARSE_H$ac_delim
 HAVE_EXPAT!$HAVE_EXPAT$ac_delim
 SN_CFLAGS!$SN_CFLAGS$ac_delim
@@ -9369,7 +9398,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -9596,6 +9625,11 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9649,6 +9683,7 @@
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -9813,8 +9848,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -9992,6 +10028,7 @@
         Building with GConf:                ${enable_gconf}
         Building with Session support:      ${enable_session}
         Building with Composite manager:    ${enable_composite}
+        Building with Frame animations:     ${enable_frameanimation}
 
 
 
--- matchbox-window-manager-1.2.orig/COMPLIANCE
+++ matchbox-window-manager-1.2/COMPLIANCE
@@ -0,0 +1,50 @@
+#
+# EWMH hints
+#
+
+[ ] : not implemented
+[*] : partially implemented
+[+] : supported
+[-] : unsupported/unused/ignored
+
+Root Window Properties (and Related Messages)
+[+] _NET_SUPPORTED
+[+] _NET_CLIENT_LIST
+[*] _NET_NUMBER_OF_DESKTOPS
+[+] _NET_DESKTOP_GEOMETRY
+[-] _NET_DESKTOP_VIEWPORT
+[*] _NET_CURRENT_DESKTOP
+[-] _NET_DESKTOP_NAMES
+[+] _NET_ACTIVE_WINDOW
+[+] _NET_WORKAREA
+[+] _NET_SUPPORTING_WM_CHECK
+[-] _NET_VIRTUAL_ROOTS
+[+] _NET_DESKTOP_LAYOUT
+[+] _NET_SHOWING_DESKTOP
+    
+Other Root Window Messages
+[+] _NET_CLOSE_WINDOW
+[-] _NET_MOVERESIZE_WINDOW
+[-] _NET_WM_MOVERESIZE
+    
+Application Window Properties
+[+] _NET_WM_NAME
+[-] _NET_WM_VISIBLE_NAME
+[-] _NET_WM_ICON_NAME
+[-] _NET_WM_VISIBLE_ICON_NAME
+[+] _NET_WM_DESKTOP
+[+] _NET_WM_WINDOW_TYPE
+[*] _NET_WM_STATE
+    Support exists for;
+    _NET_WM_STATE_MODAL, _NET_WM_STATE_FULLSCREEN, _NET_WM_STATE_ABOVE
+[*] _NET_WM_ALLOWED_ACTIONS
+[-] _NET_WM_STRUT
+[-] _NET_WM_STRUT_PARTIAL
+[-] _NET_WM_ICON_GEOMETRY
+[+] _NET_WM_ICON
+[+] _NET_WM_PID
+[-] _NET_WM_HANDLED_ICONS
+[-] _NET_WM_USER_TIME
+    
+Window Manager Protocols
+[+] _NET_WM_PING
\ No newline at end of file