merge of '19cba47403d3f84e9f053863d3371ac3af470966'

     and 'b8fa5480d2b2cfdbca87e0a6795f2eec374b08b4'

20 files changed, 389 insertions, 176 deletions

diff --git a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty b/packages/dmalloc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty
+++ b/packages/dmalloc/.mtn2git_empty
diff --git a/packages/dmalloc/dmalloc_5.5.2.bb b/packages/dmalloc/dmalloc_5.5.2.bb
new file mode 100644
index 0000000000..c91152b537
--- /dev/null
+++ b/packages/dmalloc/dmalloc_5.5.2.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Debug Malloc Library"
+SECTION = "libs/devel"
+HOMEPAGE = "http://dmalloc.com"
+LICENSE = "CCSA"
+
+SRC_URI = "\
+  http://dmalloc.com/releases/dmalloc-${PV}.tgz \
+  file://configure-pagesize-HACK.patch;patch=1 \
+# HACK we ship a preconfigured conf.h since otherwise it misses a whole lot of stuff and compilation fails.
+# TODO find out why and get rid of it
+  file://conf.h \
+"
+inherit autotools pkgconfig
+
+do_configure_append() {
+	install -m 0644 ${WORKDIR}/conf.h ${S}
+}
+
+do_stage() {
+	oe_libinstall -a libdmalloc ${STAGING_LIBDIR}
+}
+
+do_install() {
+	:
+}
diff --git a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty b/packages/dmalloc/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty
+++ b/packages/dmalloc/files/.mtn2git_empty
diff --git a/packages/dmalloc/files/conf.h b/packages/dmalloc/files/conf.h
new file mode 100644
index 0000000000..d2d9c4af0c
--- /dev/null
+++ b/packages/dmalloc/files/conf.h
@@ -0,0 +1,274 @@
+/* conf.h.  Generated by configure.  */
+/*
+ * Automatic configuration flags
+ *
+ * Copyright 2000 by Gray Watson
+ *
+ * This file is part of the dmalloc package.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose and without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice appear
+ * in all copies, and that the name of Gray Watson not be used in
+ * advertising or publicity pertaining to distribution of the document
+ * or software without specific, written prior permission.
+ *
+ * Gray Watson makes no representations about the suitability of the
+ * software described herein for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * The author may be contacted via http://dmalloc.com/
+ *
+ * $Id: conf.h.in,v 1.99 2005/12/21 13:40:27 gray Exp $
+ */
+
+#ifndef __CONF_H__
+#define __CONF_H__
+
+/* please see settings.h for manual configuration options */
+
+/*
+ * NOTE: The following settings should not need to be tuned by hand.
+ */
+
+/*
+ * Set to 1 if the mprotect function was found and the PROT_NONE,
+ * PROT_READ, and PROT_WRITE defines were found in sys/mman.h.  This
+ * is so that we can restrict access to certain blocks of memory.
+ */
+#define PROTECT_ALLOWED 1
+
+/*
+ * (char *)sbrk(const int incr) is the main heap-memory allocation
+ * routine that most systems employ.  This extends the program's data
+ * space by INCR number of bytes.
+ *
+ * NOTE: If configure generates a 0 for this and HAVE_MMAP on your
+ * system, you should see the INTERNAL_MEMORY_SPACE setting in the
+ * settings.h file which is created from the settings.dist file.
+ */
+#define HAVE_SBRK 1
+
+/*
+ * (void *)mmap(...) is another heap-memory allocation routine that
+ * systems employ.  On newer systems it is often preferable over sbrk.
+ * It allocates a block of memory in the virtual-memory system.  The
+ * USE_MMAP define is set if the standard mmap call works.
+ *
+ * NOTE: If configure generates a 0 for this and HAVE_SBRK on your
+ * system, you should see the INTERNAL_MEMORY_SPACE setting in the
+ * settings.h file which is created from the settings.dist file.
+ */
+#define HAVE_MMAP 1
+#define USE_MMAP 1
+
+/*
+ * This is the basic block size in bits.  If possible, the configure
+ * script will set this to be the value returned by the getpagesize()
+ * function.  If not then some sort of best guess will be necessary.
+ * 15 (meaning basic block size of 32k) will probably be good.
+ *
+ * NOTE: some sbrk functions round to the correct page-size.  No
+ * problems aside from a possible small increase in the administration
+ * overhead should happen if this value is too high.
+ */
+#define BASIC_BLOCK 12
+
+/*
+ * The alignment value of all allocations in number of bytes for
+ * loading admin information before an allocation.  If possible, the
+ * configure script will set this to be the value returned by
+ * sizeof(long) which in most systems is the register width.
+ *
+ * NOTE: the value will never be auto-configured to be less than 8
+ * because some system (like sparc for instance) report the sizeof(long)
+ * == 4 while the register size is 8 bytes.  Certain memory needs to be of
+ * the same base as the register size (stack frames, code, etc.).  Any
+ * ideas how I can determine the register size in a better (and portable)
+ * fashion?
+ *
+ * NOTE: larger the number the more memory may be wasted by certain
+ * debugging settings like fence-post checking.
+ */
+#define ALLOCATION_ALIGNMENT 8
+
+/*
+ * This checks to see if the abort routine does extensive cleaning up
+ * before halting a program.  If so then it may call malloc functions
+ * making the library go recursive.  If abort is set to not okay then
+ * you should tune the KILL_PROCESS and SIGNAL_INCLUDE options in
+ * settings.h if you want the library to be able to dump core.
+ */
+#define ABORT_OKAY 1
+
+/*
+ * This checks to see if we can include signal.h and get SIGHUP,
+ * SIGINT, and SIGTERM for the catch-signals token.  With this token,
+ * you can have the library do an automatic shutdown if we see the
+ * above signals.
+ */
+#define SIGNAL_OKAY 1
+#define RETSIGTYPE void
+
+/*
+ * This checks to see if we can include return.h and use the assembly
+ * macros there to call the callers address for logging.  If you do
+ * not want this behavior, then set the USE_RETURN_MACROS to 0 in the
+ * settings.h file.
+ */
+#define RETURN_MACROS_WORK 1
+
+/*
+ * Why can't the compiler folks agree about this.  I really hate Unix
+ * sometimes for its blatant disregard for anything approaching a
+ * standard.
+ */
+#define IDENT_WORKS 1
+
+/*
+ * Which pthread include file to use.
+ */
+#define HAVE_PTHREAD_H 1
+#define HAVE_PTHREADS_H 0
+
+/*
+ * What pthread functions do we have?
+ */
+#define HAVE_PTHREAD_MUTEX_INIT 1
+#define HAVE_PTHREAD_MUTEX_LOCK 1
+#define HAVE_PTHREAD_MUTEX_UNLOCK 1
+
+/*
+ * What is the pthread mutex type?  Usually (always?) it is
+ * pthread_mutex_t.
+ */
+#define THREAD_MUTEX_T pthread_mutex_t
+
+/*
+ * On some systems, you initialize mutex variables with NULL.  Others
+ * require various stupid non-portable incantations.  The OSF 3.2 guys
+ * should be ashamed of themselves.  This only is used if the
+ * LOCK_THREADS setting is enabled in the settings.h.
+ */
+#define THREAD_LOCK_INIT_VAL 0
+
+/*
+ * Under the Cygwin environment, when malloc calls getenv, it core
+ * dumps.  This is because Cygwin, as far as I know, is loading the
+ * shared libraries for the various system functions and goes
+ * recursive with a call to getenv.  Ugh.
+ *
+ * So we have to delay the getenv call.  This sets when we can do the
+ * getenv call so the environmental processing is delayed.
+ */
+#define GETENV_SAFE 1
+
+/*
+ * See whether support exists for the constructor attribute which
+ * allows the library to run code before main() is called.  I know
+ * that later versions of gcc have support for this and maybe other
+ * compilers do as well.
+ */
+#define CONSTRUCTOR_WORKS 1
+
+/*
+ * See whether support exists for the destructor attribute which
+ * allows the library to run code after main() is exited.  I know
+ * that later versions of gcc have support for this and maybe other
+ * compilers do as well.
+ */
+#define DESTRUCTOR_WORKS 1
+
+/*
+ * See if we have the GetEnvironmentVariableA Cygwin function.  This
+ * is used as a getenv replacement.
+ */
+#define HAVE_GETENVIRONMENTVARIABLEA 0
+
+/*
+ * LIBRARY DEFINES:
+ */
+
+/*
+ * Whether the compiler and OS has standard C headers.
+ */
+#define STDC_HEADERS 1
+
+/*
+ * Some systems have functions which can register routines to be
+ * called by exit(3) (or when the program returns from main).  This
+ * functionality allows the dmalloc_shutdown() routine to be called
+ * automatically upon program completion so that the library can log
+ * statistics.  Use the AUTO_SHUTDOWN define above to disable this.
+ * Please send me mail if this functionality exists on your system but
+ * in another name.
+ *
+ * NOTE: If neither is available, take a look at atexit.c in the
+ * contrib directory which may provide this useful functionality for
+ * your system.
+ */
+#define HAVE_ATEXIT 1
+#define HAVE_ON_EXIT 1
+
+/* Is the DMALLOC_SIZE type unsigned? */
+#define DMALLOC_SIZE_UNSIGNED 1
+
+/*
+ * The dmalloc library provides its own versions of the following
+ * functions, or knows how to work around their absence.
+ */
+/* bells and whistles */
+#define HAVE_FORK 1
+#define HAVE_GETHOSTNAME 1
+#define HAVE_GETPID 1
+#define HAVE_GETUID 1
+#define HAVE_TIME 1
+#define HAVE_CTIME 1
+
+#define HAVE_VPRINTF 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VSNPRINTF 1
+
+#define HAVE_RECALLOC 0
+#define HAVE_MEMALIGN 1
+#define HAVE_VALLOC 1
+
+/* various functions for arg checking and/or internal use */
+
+#define HAVE_ATOI 1
+#define HAVE_ATOL 1
+#define HAVE_BCMP 1
+#define HAVE_BCOPY 1
+#define HAVE_BZERO 1
+#define HAVE_INDEX 1
+#define HAVE_MEMCCPY 1
+#define HAVE_MEMCHR 1
+#define HAVE_MEMCMP 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMSET 1
+#define HAVE_RINDEX 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRCAT 1
+#define HAVE_STRCHR 1
+#define HAVE_STRCMP 1
+#define HAVE_STRCPY 1
+#define HAVE_STRCSPN 1
+#define HAVE_STRDUP 0
+#define HAVE_STRLEN 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRNCAT 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRNCPY 1
+#define HAVE_STRNDUP 0
+#define HAVE_STRPBRK 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSEP 1
+#define HAVE_STRSPN 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOK 1
+
+/* manual settings */
+#include "settings.h"
+
+#endif /* ! __CONF_H__ */
diff --git a/packages/dmalloc/files/configure-pagesize-HACK.patch b/packages/dmalloc/files/configure-pagesize-HACK.patch
new file mode 100644
index 0000000000..e9c8d666a0
--- /dev/null
+++ b/packages/dmalloc/files/configure-pagesize-HACK.patch
@@ -0,0 +1,33 @@
+Index: dmalloc-5.5.2/configure.ac
+===================================================================
+--- dmalloc-5.5.2.orig/configure.ac
++++ dmalloc-5.5.2/configure.ac
+@@ -348,26 +348,8 @@ AC_MSG_RESULT([$ac_cv_use_mmap])
+ #
+ AC_CHECK_FUNCS(getpagesize)
+ AC_MSG_CHECKING([basic-block size])
+-ac_cv_page_size=0
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=2048) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=11 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=4096) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=12 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=8192) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=13 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=16384) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=14 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-    ac_cv_page_size=15
+-fi
++# fix to 4K for now
++ac_cv_page_size=12
+ AC_DEFINE_UNQUOTED([BASIC_BLOCK],[$ac_cv_page_size])
+ AC_MSG_RESULT([$ac_cv_page_size])
+ 
diff --git a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
deleted file mode 100644
index 5e62a1107e..0000000000
--- a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-login-0.86/gpe-login.keylaunchrc.orig	2006-05-28 20:38:39.846547024 +0200
-+++ gpe-login-0.86/gpe-login.keylaunchrc	2006-05-28 20:38:56.800969560 +0200
-@@ -1,3 +1,8 @@
- key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=???XF86PowerDown:-:/usr/bin/apm --suspend
- key=???Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb
deleted file mode 100644
index d75af4a3a0..0000000000
--- a/packages/gpe-login/gpe-login_0.87.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS    = "xkbd"
-RPROVIDES_${PN}   = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb
deleted file mode 100644
index a1d4c0e7fa..0000000000
--- a/packages/gpe-login/gpe-login_0.88.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-inherit gpe
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://use-xtscal.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
deleted file mode 100644
index c22d259a9f..0000000000
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r6"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://lock-on-supend.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.91.bb b/packages/gpe-login/gpe-login_0.91.bb
deleted file mode 100644
index 16d9e471d7..0000000000
--- a/packages/gpe-login/gpe-login_0.91.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.92.bb b/packages/gpe-login/gpe-login_0.92.bb
deleted file mode 100644
index ec168bfc93..0000000000
--- a/packages/gpe-login/gpe-login_0.92.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.93.bb b/packages/gpe-login/gpe-login_0.93.bb
index ec168bfc93..4ea1cc235e 100644
--- a/packages/gpe-login/gpe-login_0.93.bb
+++ b/packages/gpe-login/gpe-login_0.93.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -22,3 +22,16 @@ SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 
+
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
diff --git a/packages/gpe-login/gpe-login_svn.bb b/packages/gpe-login/gpe-login_svn.bb
index 9af539bad3..f02e095698 100644
--- a/packages/gpe-login/gpe-login_svn.bb
+++ b/packages/gpe-login/gpe-login_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd"
 RPROVIDES_${PN} = "gpe-session-starter"
-PV = "0.90+svn${SRCDATE}"
+PV = "0.93+svn${SRCDATE}"
 
 inherit autotools
 
@@ -16,4 +16,18 @@ SRC_URI = "${GPE_SVN} \
 
 S = "${WORKDIR}/${PN}"
 
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
+
+
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
index 854d0ea6da..a7d663985e 100644
--- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb
+++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
@@ -4,17 +4,14 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libxrender gtk-doc intltool-native sdk-default-icons"
-RDEPENDS    = "sdk-default-icons"
 PROVIDES    = "libgpewidget"
-RPROVIDES   = "libgpewidget"
-
-SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
-
-S = "${WORKDIR}/libgpewidget-${PV}"
 
 DEFAULT_PREFERENCE = "-1"
 
-inherit pkgconfig autotools
+inherit autotools pkgconfig
+
+SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
+S = "${WORKDIR}/libgpewidget-${PV}"
 
 EXTRA_OECONF = "--enable-hildon"
 
@@ -23,3 +20,5 @@ do_stage () {
 	autotools_stage_includes
 }
 
+RDEPENDS = "sdk-default-icons"
+RPROVIDES = "libgpewidget"
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index d79beeb417..39a85c52e6 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -1,18 +1,16 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-PR          = "r1"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +18,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS_${PN} = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb
index 9ea3009404..2aa529f723 100644
--- a/packages/libgpewidget/libgpewidget_0.115.bb
+++ b/packages/libgpewidget/libgpewidget_0.115.bb
@@ -1,18 +1,15 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+LICENSE = "LGPL"
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxinerama libxrender gtk-doc"
-PR          = "r1"
+DEPENDS = "gtk+ cairo libxinerama libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +17,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_svn.bb b/packages/libgpewidget/libgpewidget_svn.bb
index 8b6d0ea584..324173752d 100644
--- a/packages/libgpewidget/libgpewidget_svn.bb
+++ b/packages/libgpewidget/libgpewidget_svn.bb
@@ -3,18 +3,20 @@ SECTION = "gpe/libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PV = "0.114+svn${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-S = "${WORKDIR}/${PN}"
-PV = "0.114+svn${SRCDATE}"
-
 inherit gpe autotools pkgconfig
 
 SRC_URI = "${GPE_SVN}"
+S = "${WORKDIR}/${PN}"
 
 EXTRA_OECONF = "--enable-cairo"
 
 do_stage () {
 	autotools_stage_all
 }
+
+RRECOMMENDS_${PN} = "gpe-icons"