merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894

     and 5dc03a4f61ff65b8e7255e287dd9ead584c6c81f

30 files changed, 651 insertions, 49 deletions

diff --git a/packages/avahi/avahi_0.6.7.bb b/packages/avahi/avahi_0.6.8.bb
index f41b22017a..95c930d8e8 100644
--- a/packages/avahi/avahi_0.6.7.bb
+++ b/packages/avahi/avahi_0.6.8.bb
@@ -17,6 +17,7 @@ FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
 FILES_avahi-daemon = "${sbindir}/avahi-daemon \
 		      ${sysconfdir}/avahi/avahi-daemon.conf \
+		      ${sysconfdir}/avahi/hosts \
 		      ${sysconfdir}/avahi/services \
 		      ${sysconfdir}/dbus-1 \
 		      ${sysconfdir}/init.d/avahi-daemon \
diff --git a/packages/libmatchbox/files/svn-autofu-xsettings.patch b/packages/libmatchbox/files/svn-autofu-xsettings.patch
new file mode 100644
index 0000000000..a5df4301ff
--- /dev/null
+++ b/packages/libmatchbox/files/svn-autofu-xsettings.patch
@@ -0,0 +1,132 @@
+diff -urpN libmatchbox-1.7~orig/configure.ac libmatchbox-1.7/configure.ac
+--- libmatchbox-1.7~orig/configure.ac	2005-04-08 08:53:20.000000000 -0500
++++ libmatchbox-1.7/configure.ac	2006-02-23 00:08:20.000000000 -0600
+@@ -87,9 +87,13 @@ if test $have_libx11pc = yes; then
+    fi
+ # XXX : xau is missing from x11.pc - workaround is too add here 
+    PKG_CHECK_MODULES(XLIBS, x11 xext  $xft_pkg)
++   XLIBS_REQUIRED="x11 xext"
+ else
+ 
+ AC_PATH_XTRA
++if test x"$no_x" = x"yes"; then
++    AC_MSG_ERROR([*** Required X11 Headers and libraries not found.***])
++fi
+ 
+ XFT_LIBS=
+ XFT_CFLAGS=
+@@ -125,8 +129,12 @@ fi
+ XLIBS_CFLAGS="$XLIBS_CLAGS $XFT_CFLAGS"
+ XLIBS_LIBS="$X_LIBS $XFT_LIBS -lX11 -lXext"
+ 
++MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS"
++
+ fi
+ 
++# do this here for freetype include
++MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XLIBS_CFLAGS"
+ 
+ dnl ------ Check for Pango ---------------------------------------------------
+ 
+@@ -135,6 +143,7 @@ if test x$enable_pango != xno; then
+   if test x$have_pango=xyes; then
+     AC_DEFINE(USE_PANGO, [1], [Use Pango])
+     SUPPORTS_PANGO=1
++    PANGO_REQUIRED="pango pangoxft"
+   else
+     AC_MSG_WARN([*** Cannot find pango, disabling support])
+     enable_pango=no
+@@ -152,6 +161,7 @@ if test x$enable_png != xno; then
+ 	PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
+         AC_DEFINE(USE_PNG, [1], [Use Png])
+ 	SUPPORTS_PNG=1
++	PNG_REQUIRED="libpng12"
+   else
+ 	AC_MSG_RESULT(no)
+         # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] )
+@@ -161,6 +171,7 @@ if test x$enable_png != xno; then
+             AC_DEFINE(USE_PNG, [1], [Use Png])
+ 	    SUPPORTS_PNG=1
+             PNG_LIBS="-lpng -lz"
++            MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XLIBS_LIBS $PNG_LIBS"
+         else
+ 	    AC_MSG_WARN([*** Cannot find PNG, disabling support])
+             enable_png=no
+@@ -179,6 +190,7 @@ if test x$enable_jpeg != xno; then
+         AC_DEFINE(USE_JPG, [1], [Use JPEG])
+ 	SUPPORTS_JPEG=1
+ 	JPEG_LIBS="-ljpeg"
++        MB_EXTRA_LIBS="$MB_EXTRA_LIBS -ljpeg"
+   else
+ 	AC_MSG_WARN([*** Cannot find libjpeg, disabling support])
+         enable_jpeg=no
+@@ -231,6 +243,9 @@ if test x$enable_xsettings != xno; then
+    CPPFLAGS="$saved_CPPFLAGS"
+    LIBS="$saved_LIBS"
+ 
++   MB_EXTRA_LIBS="$MB_EXTRA_LIBS $XSET_LIBS"	
++   MB_EXTRA_CFLAGS="$MB_EXTRA_CFLAGS $XSET_CFLAGS"	
++
+    AC_DEFINE(USE_XSETTINGS, [1], [Use XSettings Client])
+ 
+    AC_MSG_RESULT([yes])
+@@ -319,6 +334,12 @@ AC_SUBST(GCC_WARNINGS)
+ AC_SUBST(XSET_LIBS)
+ AC_SUBST(XSET_CFLAGS)
+ 
++AC_SUBST(MB_EXTRA_LIBS)
++AC_SUBST(MB_EXTRA_CFLAGS)
++AC_SUBST(XLIBS_REQUIRED)
++AC_SUBST(PANGO_REQUIRED)
++AC_SUBST(PNG_REQUIRED)
++
+ dnl ------ Below used for mbconfig.h ----------------------------------------
+ 
+ AC_SUBST(SUPPORTS_PNG)
+diff -urpN libmatchbox-1.7~orig/libmb/Makefile.am libmatchbox-1.7/libmb/Makefile.am
+--- libmatchbox-1.7~orig/libmb/Makefile.am	2005-04-08 08:53:11.000000000 -0500
++++ libmatchbox-1.7/libmb/Makefile.am	2006-02-23 00:01:54.000000000 -0600
+@@ -18,11 +18,11 @@ source_c = mbmenu.c       \
+ 
+ DATADIR=$(datadir)
+ 
+-AM_CFLAGS = @GCC_WARNINGS@ @XLIBS_CFLAGS@ @PANGO_CFLAGS@ @PNG_CFLAGS@ -DDATADIR=\"$(datadir)\"
++AM_CFLAGS = @GCC_WARNINGS@ @XLIBS_CFLAGS@ @PANGO_CFLAGS@ @PNG_CFLAGS@ @XSET_LIBS@ -DDATADIR=\"$(datadir)\"
+ 
+ lib_LTLIBRARIES      = libmb.la
+ libmb_la_SOURCES     = $(source_c) $(source_h)
+-libmb_la_LIBADD      = @XLIBS_LIBS@ @PANGO_LIBS@ @JPEG_LIBS@ @PNG_LIBS@
++libmb_la_LIBADD      = @XLIBS_LIBS@ @PANGO_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @XSET_CFLAGS@
+ 
+ # http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91
+ # current : revision : age
+diff -urpN libmatchbox-1.7~orig/libmb/mbtray.c libmatchbox-1.7/libmb/mbtray.c
+--- libmatchbox-1.7~orig/libmb/mbtray.c	2006-02-23 00:01:07.000000000 -0600
++++ libmatchbox-1.7/libmb/mbtray.c	2006-02-23 00:09:45.000000000 -0600
+@@ -26,7 +26,13 @@
+ 
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++#endif
+ 
+ #include "mbtray.h"
+ 
+diff -urpN libmatchbox-1.7~orig/libmb.pc.in libmatchbox-1.7/libmb.pc.in
+--- libmatchbox-1.7~orig/libmb.pc.in	2005-03-20 11:43:26.000000000 -0600
++++ libmatchbox-1.7/libmb.pc.in	2006-02-23 00:11:18.000000000 -0600
+@@ -6,5 +6,7 @@ includedir=@includedir@
+ Name: libmb
+ Description: Utility Library used by Matchbox utilities.
+ Version: @VERSION@
+-Libs: -L${libdir} -lmb @XLIBS_LIBS@ @PANGO_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @XSET_LIBS@
+-Cflags: -I${includedir} @XLIBS_CFLAGS@ @PANGO_CFLAGS@ @PNG_CFLAGS@ @XSET_CFLAGS@
++
++Requires: @XLIBS_REQUIRED@ @PANGO_REQUIRED@ @PNG_REQUIRED@
++Libs: -L${libdir} -lmb @MB_EXTRA_LIBS@
++Cflags: -I${includedir} @MB_EXTRA_CFLAGS@
diff --git a/packages/libmatchbox/files/svn-code-misc-xsettings.patch b/packages/libmatchbox/files/svn-code-misc-xsettings.patch
new file mode 100644
index 0000000000..52b1507505
--- /dev/null
+++ b/packages/libmatchbox/files/svn-code-misc-xsettings.patch
@@ -0,0 +1,101 @@
+diff -uprN libmatchbox-1.7~orig/libmb/mbexp.c libmatchbox-1.7/libmb/mbexp.c
+--- libmatchbox-1.7~orig/libmb/mbexp.c	2006-02-23 00:33:19.000000000 -0600
++++ libmatchbox-1.7/libmb/mbexp.c	2006-02-23 00:40:06.000000000 -0600
+@@ -406,6 +406,10 @@ mb_font_new(Display *dpy, 
+ #endif
+   
+   font = malloc(sizeof(MBFont));
++
++  if (font == NULL)
++    return NULL;
++
+   memset(font, 0, sizeof(MBFont));
+ 
+   if (family != NULL)
+@@ -425,9 +429,12 @@ mb_font_new(Display *dpy, 
+    font->pgo_fontmap = pango_xft_get_font_map (font->dpy, DefaultScreen(dpy));
+    font->fontdes     = pango_font_description_new ();
+ 
+-   /* -- Needed ?
+-   pango_context_set_language (w->pgo, pango_language_from_string ("ar_AE"));
+-   */
++   /* If Pango is mis-setup the above will fail */
++   if (font->pgo_context == NULL || font->pgo_fontmap == NULL || font->fontdes == NULL)
++     {
++       free(font);
++       return NULL;
++     }
+ 
+ #elif defined (USE_XFT)
+ 
+@@ -581,8 +588,11 @@ MBFont*
+ mb_font_new_from_string(Display *dpy, char *spec) 
+ {
+   MBFont *font = mb_font_new(dpy, NULL);
+-  mb_font_set_from_string(font, spec); 
+-  return font;
++
++  if (font)
++    return mb_font_set_from_string(font, spec);
++
++  return NULL;
+ }
+ 
+ MBFont*
+@@ -1091,7 +1101,13 @@ mb_font_render_simple (MBFont          *
+       if (!len) { free(str); return 0; }
+       
+       if ((opts & MB_FONT_RENDER_OPTS_CLIP_TRAIL) && len > 3)
++   {
++     /* Avoid having a space before the elipsis */
++     while (len-1 >= 0 && str[len-1] == ' ')
++       len--;
++
+ 	  want_dots = True;
++   }
+     }
+   else
+     {
+diff -uprN libmatchbox-1.7~orig/libmb/mbmenu.c libmatchbox-1.7/libmb/mbmenu.c
+--- libmatchbox-1.7~orig/libmb/mbmenu.c	2006-02-23 00:33:19.000000000 -0600
++++ libmatchbox-1.7/libmb/mbmenu.c	2006-02-23 00:42:23.000000000 -0600
+@@ -19,6 +19,10 @@
+ 
+ #define _GNU_SOURCE
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "mbmenu.h"
+ 
+ #define MBMAX(x,y) ((x>y)?(x):(y))
+@@ -664,7 +668,7 @@ mb_menu_check_scroll_button(MBMenu *mb,M
+       return WANT_SCROLL_DOWN;
+     }
+ 
+-  /*
++#if 0
+   for(tmpi = m->too_big_start_item;
+       tmpi != NULL; 
+       tmpi = tmpi->next_item)
+@@ -679,7 +683,7 @@ mb_menu_check_scroll_button(MBMenu *mb,M
+       MENUDBG("%s() retruning want scroll up\n", __func__);
+       return WANT_SCROLL_UP;
+     }
+-  */
++#endif /* #if 0 */
+ 
+   if (m->too_big_end_item
+       && y_pos > (m->too_big_end_item->y+m->too_big_end_item->h))
+diff -uprN libmatchbox-1.7~orig/libmb/mbpixbuf.c libmatchbox-1.7/libmb/mbpixbuf.c
+--- libmatchbox-1.7~orig/libmb/mbpixbuf.c	2006-02-23 00:33:19.000000000 -0600
++++ libmatchbox-1.7/libmb/mbpixbuf.c	2006-02-23 00:43:02.000000000 -0600
+@@ -907,6 +907,7 @@ mb_pixbuf_new_extended(Display *dpy, 
+ 	  fprintf(stderr, "mbpixbuf: unable to use XShm. DISPLAY remote?\n");
+ 	  pb->have_shm = False;
+ 	}
++      else XShmDetach(pb->dpy, &shminfo);
+ 
+       shmdt(shminfo.shmaddr);
+       shmctl(shminfo.shmid, IPC_RMID, 0);
diff --git a/packages/libmatchbox/files/svn-explicit-types.patch b/packages/libmatchbox/files/svn-explicit-types.patch
new file mode 100644
index 0000000000..3ec1295a6b
--- /dev/null
+++ b/packages/libmatchbox/files/svn-explicit-types.patch
@@ -0,0 +1,363 @@
+diff -bur libmatchbox-1.7~orig/libmb/hash.c libmatchbox-1.7/libmb/hash.c
+--- libmatchbox-1.7~orig/libmb/hash.c	2005-03-20 11:43:25.000000000 -0600
++++ libmatchbox-1.7/libmb/hash.c	2006-02-19 14:40:43.000000000 -0600
+@@ -68,7 +68,7 @@
+    } else {
+       free((void *) np->value);
+    }
+-   if ((np->value = strdup(val)) == NULL)
++   if ((np->value = (unsigned char*)strdup(val)) == NULL)
+       return NULL;
+    return np;
+ }
+diff -bur libmatchbox-1.7~orig/libmb/mbdotdesktop.c libmatchbox-1.7/libmb/mbdotdesktop.c
+--- libmatchbox-1.7~orig/libmb/mbdotdesktop.c	2005-03-28 16:56:35.000000000 -0600
++++ libmatchbox-1.7/libmb/mbdotdesktop.c	2006-02-19 14:44:05.000000000 -0600
+@@ -200,7 +200,7 @@
+   /* Source iterator, destination iterator */
+   char *s, *d;
+   
+-  s = source = mb_dotdesktop_get (dd, "Exec");
++  s = source = (char*)mb_dotdesktop_get (dd, "Exec");
+   if (source == NULL)
+     return NULL;
+   
+@@ -348,7 +348,7 @@
+ 		    {
+ 		      theme_name_cur = NULL;
+ 		      strncpy(theme_name_cur, 
+-			      mb_dotdesktop_get(dd, "Inherits"), 512);
++			      (char*)mb_dotdesktop_get(dd, "Inherits"), 512);
+ 		      i = 2;
+ 		    }
+ 		  mb_dotdesktop_free(dd);
+@@ -450,13 +450,13 @@
+ 		}
+ 	      memset(entry_cur, 0, sizeof(MBDotDesktopFolderEntry));
+ 	  
+-	      entry_cur->name = strdup(mb_dotdesktop_get(dd, "Name"));
+-	      entry_cur->match = strdup(mb_dotdesktop_get(dd, "Match"));
++	      entry_cur->name = (unsigned char*)strdup((char*)mb_dotdesktop_get(dd, "Name"));
++	      entry_cur->match = (unsigned char*)strdup((char*)mb_dotdesktop_get(dd, "Match"));
+ 
+ 	      if (mb_dotdesktop_get(dd, "Icon"))
+ 		{
+ 		  entry_cur->icon 
+-		    = strdup(mb_dotdesktop_get(dd, "Icon"));
++		    = (unsigned char*)strdup((char*)mb_dotdesktop_get(dd, "Icon"));
+ 		}
+ 
+ 	      folders->n_entries++;
+diff -bur libmatchbox-1.7~orig/libmb/mbexp.c libmatchbox-1.7/libmb/mbexp.c
+--- libmatchbox-1.7~orig/libmb/mbexp.c	2005-03-20 11:43:25.000000000 -0600
++++ libmatchbox-1.7/libmb/mbexp.c	2006-02-19 14:50:42.000000000 -0600
+@@ -894,7 +894,7 @@
+ 		 int             encoding,
+ 		 int             opts)
+ {
+-  int len = strlen(txt);
++  int len = strlen((char*)txt);
+ 
+   /* we cant clip single char string */
+   if (len < 2) return 0;
+@@ -907,7 +907,7 @@
+       memset(str, 0, len+5);
+ 
+       /* len += 2; */
+-      strcpy(str, txt);
++      strcpy((char*)str, (char*)txt);
+ 
+       do {
+ 	  /* go back a glyth */
+@@ -1066,12 +1066,12 @@
+   if (!_mb_font_is_font_object_fresh (font))
+     _mb_font_load(font);
+ 
+-  orig_len = len = strlen(text);
++  orig_len = len = strlen((char*)text);
+ 
+   str = malloc(len+3);
+   memset(str, 0, len+3);
+ 
+-  strcpy(str, text);
++  strcpy((char*)str, (char*)text);
+ 
+   render_w = mb_font_get_txt_width(font, str, len, encoding);
+ 
+@@ -1147,12 +1147,12 @@
+   if (!_mb_font_is_font_object_fresh (font))
+     _mb_font_load(font);
+ 
+-  orig_len = len = strlen(text);
++  orig_len = len = strlen((char*)text);
+ 
+   str = malloc(len+3);
+   memset(str, 0, len+3);
+ 
+-  strcpy(str, text);
++  strcpy((char*)str, (char*)text);
+ 
+   render_w = mb_font_get_txt_width(font, str, len, encoding);
+ 
+@@ -1257,7 +1257,7 @@
+ {
+   if (layout->txt) free(layout->txt);
+ 
+-  layout->txt = strdup(text);
++  layout->txt = (unsigned char*)strdup((char*)text);
+   layout->txt_encoding = encoding;
+ }
+ 
+@@ -1304,7 +1304,7 @@
+ 			 MBFontRenderOpts opts,
+ 			 Bool             do_render)
+ {
+-  unsigned char *orig_p, *p = strdup(layout->txt);
++  unsigned char *orig_p, *p = (unsigned char*)strdup((char*)layout->txt);
+   unsigned char *q = p;
+   unsigned char *backtrack = NULL;
+   int            v_offset  = 0;
+@@ -1326,7 +1326,7 @@
+ 	  
+ 	  /* XXX q should be current_line_start */
+ 
+-	  cur_width = mb_font_get_txt_width(layout->font, q, strlen(q), 
++	  cur_width = mb_font_get_txt_width(layout->font, q, strlen((char*)q), 
+ 					    layout->txt_encoding) ;
+ 	  
+ 	  if (cur_width > layout->width )
+@@ -1405,7 +1405,7 @@
+ 
+   if (layout->_have_autocalc_size) /* Easy case */
+     {
+-      unsigned char *str = strdup(layout->txt), *start = NULL, *orig = NULL;
++      char *str = strdup((char*)layout->txt), *start = NULL, *orig = NULL;
+ 
+       orig = str;
+ 
+@@ -1426,7 +1426,7 @@
+ 		                 x,
+ 		                 y,
+ 				 layout->width,
+-				 start,
++				 (unsigned char*)start,
+ 		                 layout->txt_encoding,
+ 		                 0 );
+ 	  
+diff -bur libmatchbox-1.7~orig/libmb/mbexp.h libmatchbox-1.7/libmb/mbexp.h
+--- libmatchbox-1.7~orig/libmb/mbexp.h	2005-03-20 11:43:25.000000000 -0600
++++ libmatchbox-1.7/libmb/mbexp.h	2006-02-19 14:51:20.000000000 -0600
+@@ -92,7 +92,7 @@
+ typedef struct MBFont 
+ {
+   Display              *dpy; 
+-  unsigned char        *family;
++  char                 *family;
+   int                   weight;
+   int                   slant;
+   int                   pt_size;
+diff -bur libmatchbox-1.7~orig/libmb/mbmenu.c libmatchbox-1.7/libmb/mbmenu.c
+--- libmatchbox-1.7~orig/libmb/mbmenu.c	2005-03-20 11:43:25.000000000 -0600
++++ libmatchbox-1.7/libmb/mbmenu.c	2006-02-19 14:53:33.000000000 -0600
+@@ -726,25 +726,25 @@
+ 	      if (mb_dotdesktop_get(theme, "MenuBgColor"))
+ 		{
+ 		  mb_menu_set_col(mb, MBMENU_SET_BG_COL, 
+-				  mb_dotdesktop_get(theme, "MenuBgColor"));
++				  (char*)mb_dotdesktop_get(theme, "MenuBgColor"));
+ 		}
+ 
+ 	      if (mb_dotdesktop_get(theme, "MenuFont"))
+ 		{
+ 		  mb_menu_set_font (mb, 
+-				    mb_dotdesktop_get(theme, "MenuFont"));
++				    (char*)mb_dotdesktop_get(theme, "MenuFont"));
+ 		}
+ 
+ 	      if (mb_dotdesktop_get(theme, "MenuFgColor"))
+ 		{
+ 		  mb_menu_set_col(mb, MBMENU_SET_FG_COL, 
+-				  mb_dotdesktop_get(theme, "MenuFgColor"));
++				  (char*)mb_dotdesktop_get(theme, "MenuFgColor"));
+ 		}
+ 
+ 	      if (mb_dotdesktop_get(theme, "MenuHlColor"))
+ 		{
+ 		  mb_menu_set_col(mb, MBMENU_SET_HL_COL, 
+-				  mb_dotdesktop_get(theme, "MenuHlColor"));
++				  (char*)mb_dotdesktop_get(theme, "MenuHlColor"));
+ 		    mb->have_highlight_col = True;
+ 		}
+ 	      else mb->have_highlight_col = False;
+@@ -752,7 +752,7 @@
+ 	      if (mb_dotdesktop_get(theme, "MenuBdColor"))
+ 		{
+ 		  mb_menu_set_col(mb, MBMENU_SET_BD_COL, 
+-				  mb_dotdesktop_get(theme, "MenuBdColor"));
++				  (char*)mb_dotdesktop_get(theme, "MenuBdColor"));
+ 		}
+ 
+ 	      /* xxx currently broke xxx
+diff -bur libmatchbox-1.7~orig/libmb/mbpixbuf.c libmatchbox-1.7/libmb/mbpixbuf.c
+--- libmatchbox-1.7~orig/libmb/mbpixbuf.c	2005-03-30 06:21:26.000000000 -0600
++++ libmatchbox-1.7/libmb/mbpixbuf.c	2006-02-19 14:55:39.000000000 -0600
+@@ -418,7 +418,7 @@
+ 		      col[0] = 0;
+ 		      s[0] = 0;
+ 		      len = strlen(line);
+-		      strncpy(cmap[j].str, line, cpp);
++		      strncpy((char*)cmap[j].str, line, cpp);
+ 		      cmap[j].str[cpp] = 0;
+ 		      cmap[j].r = -1;
+ 		      cmap[j].transp = 0;
+@@ -537,7 +537,7 @@
+ 			  i--;
+ 			  for (j = 0; j < ncolors; j++)
+ 			    {
+-			      if (!strcmp(col, cmap[j].str))
++			      if (!strcmp(col, (char*)cmap[j].str))
+ 				{
+ 				  if (transp && cmap[j].transp)
+ 				    {
+@@ -1086,7 +1086,8 @@
+   int num_of_cols = 1 << pb->depth;
+ 
+   Window chld;
+-  unsigned int rx, rw, rh, rb, rdepth;
++  int rx;
++  unsigned int rw, rh, rb, rdepth;
+ 
+   XShmSegmentInfo shminfo; 
+ 
+diff -bur libmatchbox-1.7~orig/libmb/mbtray.c libmatchbox-1.7/libmb/mbtray.c
+--- libmatchbox-1.7~orig/libmb/mbtray.c	2005-03-20 11:43:25.000000000 -0600
++++ libmatchbox-1.7/libmb/mbtray.c	2006-02-19 14:59:20.000000000 -0600
+@@ -204,7 +204,7 @@
+ {
+   XEvent xevent;
+   Atom timestamp_atom = XInternAtom(dpy, "_MB_DOCK_TIMESTAMP", False);
+-  char c = 'a';
++  unsigned char c = 'a';
+ 
+   XChangeProperty (dpy, RootWindow(dpy, DefaultScreen(dpy)), 
+ 		   timestamp_atom, timestamp_atom,
+@@ -615,7 +615,7 @@
+ 
+   mb->tray_id = 0;
+ 
+-  mb->app_name = app_name ? strdup(app_name) : strdup("unnamed");
++  mb->app_name = (unsigned char*)(app_name ? strdup((char*)app_name) : strdup("unnamed"));
+ 
+   mb->have_cached_bg = False; 
+   mb->cached_bg      = NULL;
+@@ -638,7 +638,7 @@
+ 		      unsigned char *name)
+ {
+   if (mb->app_name) free(mb->app_name);
+-  mb->app_name = strdup(name);
++  mb->app_name = (unsigned char*)strdup((char*)name);
+ }
+ 
+ void
+@@ -649,7 +649,7 @@
+ 
+   if (mb->context_info) free(mb->context_info);
+ 
+-  mb->context_info = strdup(info);
++  mb->context_info = (unsigned char*)strdup((char*)info);
+ 
+   if (mb->win) _set_win_context_hint(mb);
+ 
+@@ -1055,7 +1055,7 @@
+ 		   mb->atoms[ATOM_NET_WM_NAME], 
+ 		   mb->atoms[ATOM_UTF8_STRING], 
+ 		   8, 
+-		   PropModeReplace, mb->app_name, strlen(mb->app_name));
++		   PropModeReplace, mb->app_name, strlen((char*)mb->app_name));
+ }
+ 
+ static void
+@@ -1068,7 +1068,7 @@
+ 		       mb->atoms[ATOM_UTF8_STRING], 
+ 		       8, 
+ 		       PropModeReplace, 
+-		       mb->context_info, strlen(mb->context_info));
++		       mb->context_info, strlen((char*)mb->context_info));
+     }
+ }
+ 
+@@ -1170,7 +1170,7 @@
+   
+   TRAYDBG("%s() set w: %i, h: %i\n", __func__, mb->w, mb->h);
+ 
+-  XSetStandardProperties(mb->dpy, mb->win, mb->app_name,
++  XSetStandardProperties(mb->dpy, mb->win, (char*)mb->app_name,
+ 			 NULL, 0, NULL, 0, &size_hints);
+ 
+   _set_win_utf8_name(mb);
+@@ -1186,7 +1186,7 @@
+ mb_tray_app_tray_send_message(MBTrayApp *mb, unsigned char* msg, int timeout)
+ {
+    unsigned char buf[20];
+-   int msg_len = strlen(msg);
++   int msg_len = strlen((char*)msg);
+    int id = 12345; /* TODO id should unique */
+    int bytes_sent = 0;
+    
+diff -bur libmatchbox-1.7~orig/libmb/mbutil.c libmatchbox-1.7/libmb/mbutil.c
+--- libmatchbox-1.7~orig/libmb/mbutil.c	2005-03-28 17:08:38.000000000 -0600
++++ libmatchbox-1.7/libmb/mbutil.c	2006-02-19 15:02:19.000000000 -0600
+@@ -111,9 +111,8 @@
+ 
+   Atom type;
+   int format;
+-  long bytes_after;
+   unsigned char *data = NULL;
+-  long n_items;
++  unsigned long n_items, bytes_after;
+   int result;
+ 
+   unsigned char *p, *key = NULL, *value = NULL;
+@@ -153,9 +152,9 @@
+ 
+       *p = '\0';      
+ 
+-      if (!strcmp(key, bin_name))
++      if (!strcmp((char*)key, (char*)bin_name))
+ 	{
+-	  win_found = atoi(value); /* XXX should check window ID 
++	  win_found = atoi((char*)value); /* XXX should check window ID 
+ 				      actually exists */
+ 	  XFree (data);
+ 	  return ( (win_found > 0) ? win_found : None );
+@@ -175,9 +174,8 @@
+ 
+   Atom type;
+   int format;
+-  long bytes_after;
+   unsigned char *data = NULL;
+-  long n_items;
++  unsigned long n_items, bytes_after;
+   int result;
+ 
+   result =  XGetWindowProperty (dpy, RootWindow(dpy, DefaultScreen(dpy)), 
+@@ -195,7 +193,7 @@
+ 
+ 
+ 
+-  if (strstr(data, bin_name) != NULL)
++  if (strstr((char*)data, (char*)bin_name) != NULL)
+     {
+       XFree(data);
+       return True;
+@@ -282,9 +280,8 @@
+ 
+   Atom type;
+   int format;
+-  long bytes_after;
+   Pixmap *data = NULL;
+-  long n_items;
++  unsigned long n_items, bytes_after;
+   int result;
+ 
+   result =  XGetWindowProperty (dpy, RootWindow(dpy, DefaultScreen(dpy)),
diff --git a/packages/libmatchbox/libmatchbox_1.7.bb b/packages/libmatchbox/libmatchbox_1.7.bb
index afcf058663..c3fef81f0d 100644
--- a/packages/libmatchbox/libmatchbox_1.7.bb
+++ b/packages/libmatchbox/libmatchbox_1.7.bb
@@ -1,6 +1,10 @@
 include libmatchbox.inc
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
+	   file://svn-explicit-types.patch;patch=1 \
+	   file://svn-autofu-xsettings.patch;patch=1 \
+	   file://svn-code-misc-xsettings.patch;patch=1 \
 	   file://check.m4"
 
 do_configure_prepend () {
diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb
index f50baf64ad..eb5e97cc70 100644
--- a/packages/linux/LAB-kernel_2.6.13-hh2.bb
+++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb
@@ -28,8 +28,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index 25241cec1e..7b6aa5b23d 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -35,8 +35,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
 #add the bootshim?
 }
 
diff --git a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
index 5b594a959b..8f42d6b383 100644
--- a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -5,7 +5,7 @@ KERNEL_CONSOLE = "tty0"
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-	${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin
+	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin
 }
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
index a0571bedb7..0b8b6ab63a 100644
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
@@ -31,8 +31,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/ep93xx-kernel_2.6.15.bb b/packages/linux/ep93xx-kernel_2.6.15.bb
index ba8ab0ec53..b29011f5f4 100644
--- a/packages/linux/ep93xx-kernel_2.6.15.bb
+++ b/packages/linux/ep93xx-kernel_2.6.15.bb
@@ -18,8 +18,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
index f0fe6f32e9..7a5bebe437 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
@@ -27,8 +27,8 @@ do_configure() {
 }
 
 do_deploy() {
-	install -d ${DEPLOY_DIR}/images
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
 }   
    
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 28b21328b2..915efa2439 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -32,8 +32,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 2ddb7cbb61..41ff745e71 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -350,11 +350,11 @@ do_install_append() {
 do_deploy[dirs] = "${S}"
 
 deploy_image() {
-	copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2"
+	copy_image '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-'"$1" "$2"
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
 	deploy_image '${IXP4XX_SUFFIX}'
 
 	# And the machine specific images
diff --git a/packages/linux/linux-jlime-sh3_2.6.11.bb b/packages/linux/linux-jlime-sh3_2.6.11.bb
index f77de8ab9e..b646c1a3b8 100644
--- a/packages/linux/linux-jlime-sh3_2.6.11.bb
+++ b/packages/linux/linux-jlime-sh3_2.6.11.bb
@@ -19,6 +19,6 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
 }
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index 31015634cc..cce3b3c30c 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -70,10 +70,10 @@ fi
 FILES_kernel += " /tmp"
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-	install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin
-        install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
-	install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
+        install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin
+        install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec
+	install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
index adaf84f1cc..5cb4a439b1 100644
--- a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
+++ b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
@@ -25,8 +25,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index e3dc282017..133fe9ac2c 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -32,12 +32,12 @@ do_configure_prepend() {
 }
 
 do_deploy_omap5912osk() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
         arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/linux.bin
         mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR}/linux.bin.gz ${DEPLOY_DIR}/uImage_bb.cc
         cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
-#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 8403965269..c0b01616ac 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -115,8 +115,8 @@ do_compile_append() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-sun4cdm_2.4.26.bb b/packages/linux/linux-sun4cdm_2.4.26.bb
index 5075523179..d91b952787 100644
--- a/packages/linux/linux-sun4cdm_2.4.26.bb
+++ b/packages/linux/linux-sun4cdm_2.4.26.bb
@@ -23,8 +23,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-	install -d ${DEPLOY_DIR}/images
-	elftoaout -o ${DEPLOY_DIR}/images/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
+	install -d ${DEPLOY_DIR_IMAGE}
+	elftoaout -o ${DEPLOY_DIR_IMAGE}/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index 9eb3218f6e..8e49ffa2c2 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -50,8 +50,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index efcd20df9b..0d9229c5d8 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -103,9 +103,9 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-	install -d ${DEPLOY_DIR}/images
+	install -d ${DEPLOY_DIR_IMAGE}
 	cat ${KERNEL_OUTPUT} | lzma e -si -so -eos > \
-		${DEPLOY_DIR}/images/wrt-kernel-${PV}.lzma
+		${DEPLOY_DIR_IMAGE}/wrt-kernel-${PV}.lzma
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-xxs1500_2.4.21.bb b/packages/linux/linux-xxs1500_2.4.21.bb
index e4f7fac776..4754b17046 100644
--- a/packages/linux/linux-xxs1500_2.4.21.bb
+++ b/packages/linux/linux-xxs1500_2.4.21.bb
@@ -27,8 +27,8 @@ do_configure_prepend() {
 FILES_kernel += " /tmp"
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR}/images/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index 2a4d168ac0..12422c96de 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -28,8 +28,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index d30bcf77ce..b4c675264a 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -251,8 +251,8 @@ do_install_append() {
 
 do_deploy[dirs] = "${S}"
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-	redboot_fixup '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${N2K_SUFFIX}'
+        install -d ${DEPLOY_DIR_IMAGE}
+	redboot_fixup '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${N2K_SUFFIX}'
 }
 
 addtask deploy before do_build after do_compile
diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
index 0e2ea3e804..40bceb373e 100644
--- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb
+++ b/packages/linux/nslu2-linksys-kernel_2.4.22.bb
@@ -42,8 +42,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index e5574dd35b..d9addd968a 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -91,8 +91,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index d8c87d9f02..4c8b43121d 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -105,8 +105,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index 0c3ca93fa1..f600acbaed 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -91,9 +91,9 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE} 
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-	${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
+	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 5e95d969d1..6fc575c2b0 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -29,8 +29,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 7ae9342b42..78360a54e5 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -15,6 +15,7 @@ EXTRA_OECONF_append_collie = " --enable-small-icons "
 EXTRA_OECONF_append_poodle = " --enable-small-icons "
 EXTRA_OECONF_append_mnci = " --enable-small-icons "
 EXTRA_OECONF_append_integral13 = " --enable-small-icons "
+PACKAGE_ARCH = "${MACHINE}"
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \