merge of 0fbcc5da7abe05787c6a591e53e9072cb3b115d5

     and 99f9fc9ea4f05af6472ec5a42c5a6516440654e6

49 files changed, 3721 insertions, 330 deletions

diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
new file mode 100644
index 0000000000..1027fe81cb
--- /dev/null
+++ b/conf/machine/logicpd-pxa270.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: LogicPD PXA270 Development Platform
+#@DESCRIPTION: Machine configuration for LogicPD PXA270 Zoom Development Platform
+#OLDEST_KERNEL = "2.6.17-rc5"
+TARGET_ARCH = "arm"
+PREFERRED_VERSION_mainstone-kernel = "2.6.17-rc5"
+GUI_MACHINE_CLASS = "smallscreen"
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+
+include conf/machine/include/tune-iwmmxt.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+# EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000"
+
diff --git a/packages/asterisk/asterisk-1.2.8/.mtn2git_empty b/packages/asterisk/asterisk-1.2.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.8/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.2.8/makefile.patch b/packages/asterisk/asterisk-1.2.8/makefile.patch
new file mode 100644
index 0000000000..c786d09017
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.8/makefile.patch
@@ -0,0 +1,200 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- asterisk-1.2.8/Makefile~makefile
++++ asterisk-1.2.8/Makefile
+@@ -16,6 +16,9 @@
+ # Create OPTIONS variable
+ OPTIONS=
+ # If cross compiling, define these to suit
++CROSS_COMPILE=$(CROSS_DIR)
++CROSS_COMPILE_TARGET=$(STAGING_DIR)
++CROSS_COMPILE_BIN=$(STAGING_BINDIR)
+ # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+ # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+ # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+@@ -327,13 +330,13 @@
+   endif
+ endif
+ 
+-ASTCFLAGS+= $(DEBUG_THREADS)
+-ASTCFLAGS+= $(TRACE_FRAMES)
+-ASTCFLAGS+= $(MALLOC_DEBUG)
+-ASTCFLAGS+= $(BUSYDETECT)
+-ASTCFLAGS+= $(OPTIONS)
++#ASTCFLAGS+= $(DEBUG_THREADS)
++#ASTCFLAGS+= $(TRACE_FRAMES)
++#ASTCFLAGS+= $(MALLOC_DEBUG)
++#ASTCFLAGS+= $(BUSYDETECT)
++#ASTCFLAGS+= $(OPTIONS)
+ ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+-ASTCFLAGS+= -fomit-frame-pointer 
++#ASTCFLAGS+= -fomit-frame-pointer 
+ endif
+ SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+ 
+@@ -397,7 +400,7 @@
+ endif
+ 
+ ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
+-  CFLAGS+=$(ASTCFLAGS)
++override CFLAGS+=$(ASTCFLAGS)
+ endif
+ 
+ # This is used when generating the doxygen documentation
+@@ -519,7 +522,7 @@
+ 	fi
+ 	rm -f include/asterisk/build.h.tmp
+ 	$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+-	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
+ 
+ muted: muted.o
+ 	$(CC) $(AUDIO_LIBS) -o muted muted.o
+--- asterisk-1.2.8/codecs/gsm/Makefile~makefile
++++ asterisk-1.2.8/codecs/gsm/Makefile
+@@ -51,7 +51,7 @@
+            ifneq (${PROC},ppc)
+             ifneq (${PROC},ppc64)
+              ifneq (${PROC},s390)
+-OPTIMIZE+=-march=$(PROC)
++#OPTIMIZE+=-march=$(PROC)
+              endif
+             endif
+            endif
+@@ -243,7 +243,7 @@
+ ifneq (${PROC},arm)
+ ifneq ($(shell uname -m), parisc)
+ ifneq (${PROC}, s390)
+-GSM_SOURCES+= $(SRC)/k6opt.s
++#GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+ endif
+@@ -309,7 +309,7 @@
+ ifneq ($(shell uname -m), sparc64)
+ ifneq ($(shell uname -m), armv4l)
+ ifneq ($(shell uname -m), parisc)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
++#GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+ endif
+--- asterisk-1.2.8/res/Makefile~makefile
++++ asterisk-1.2.8/res/Makefile
+@@ -89,7 +89,7 @@
+ 	fi
+ 
+ res_crypto.so: res_crypto.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
+ 
+ clean:
+ 	rm -f *.so *.o .depend
+--- asterisk-1.2.8/channels/Makefile~makefile
++++ asterisk-1.2.8/channels/Makefile
+@@ -73,7 +73,7 @@
+   SOLINK+=-lrt
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/linux/ixjuser.h),)
+   CHANNEL_LIBS+=chan_phone.so
+ endif
+ 
+@@ -88,16 +88,16 @@
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/alsa/asoundlib.h),)
+   CHANNEL_LIBS+=chan_alsa.so
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++ifneq ($(wildcard $(STAGING_LIBDIR)/libpri.so.1),)
+   CFLAGS+=-DZAPATA_PRI
+   ZAPPRI=-lpri
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
++ifneq ($(wildcard $(STAGING_LIBDIR)/libmfcr2.so.1),)
+   CFLAGS+=-DZAPATA_R2
+   ZAPR2=-lmfcr2
+ endif
+@@ -110,7 +110,7 @@
+ endif
+ 
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/linux/zaptel.h),)
+   ifeq (${OSARCH},NetBSD)
+     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+   endif
+@@ -122,7 +122,7 @@
+ endif
+ endif # WITHOUT_ZAPTEL
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/vpbapi.h),)
+   CHANNEL_LIBS+=chan_vpb.so
+   CFLAGS+=-DLINUX
+ endif
+@@ -137,7 +137,7 @@
+ 
+ ZAPDIR=/usr/lib
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/nbs.h),)
+   CHANNEL_LIBS+=chan_nbs.so
+ endif
+ 
+@@ -158,7 +158,7 @@
+ 	rm -f busy.h ringtone.h gentone gentone-ulaw
+ 
+ %.so : %.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
+ 
+ ifneq ($(wildcard .depend),)
+   include .depend
+--- asterisk-1.2.8/pbx/Makefile~makefile
++++ asterisk-1.2.8/pbx/Makefile
+@@ -59,7 +59,7 @@
+ 	$(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
+ 
+ pbx_dundi.so: dundi-parser.o pbx_dundi.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
+ 
+ %.moc : %.h
+ 	$(MOC) $< -o $@
+--- asterisk-1.2.8/formats/Makefile~makefile
++++ asterisk-1.2.8/formats/Makefile
+@@ -25,7 +25,7 @@
+ #
+ # OGG/Vorbis format
+ #
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/vorbis/codec.h),)
+   FORMAT_LIBS+=format_ogg_vorbis.so
+ endif
+ 
+--- asterisk-1.2.8/utils/Makefile~makefile
++++ asterisk-1.2.8/utils/Makefile
+@@ -22,11 +22,11 @@
+ 
+ TARGET=stereorize streamplayer
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/popt.h),)
+   TARGET+=smsq
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
++ifneq ($(wildcard $(STAGING_INCDIR)/newt.h),)
+   TARGET+=astman
+ endif
+ 
diff --git a/packages/asterisk/asterisk_1.2.8.bb b/packages/asterisk/asterisk_1.2.8.bb
new file mode 100644
index 0000000000..a9917c6e62
--- /dev/null
+++ b/packages/asterisk/asterisk_1.2.8.bb
@@ -0,0 +1,32 @@
+DESCRIPTION="The Astersisk open source software PBX"
+HOMEPAGE="www.asterisk.org"
+LICENSE="GPL"
+DEPENDS="ncurses zlib openssl curl"
+PR = "r0"
+
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
+         file://makefile.patch;patch=1"
+
+
+# Doh - they use 'L'inux intead of linux
+# FIXME:  Do the sed here
+
+export OSARCH="Linux"
+export PROC="${TARGET_ARCH}"
+
+# We will probably have to edit the CFLAG in the Makefile
+
+do_compile() {
+        oe_runmake
+}
+
+do_install() {
+        oe_runmake DESTDIR=${D} install
+}
+
+do_stage () {
+        install -d ${STAGING_INCDIR}/asterisk
+        install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
+}
+
+
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index a207702eba..099f739656 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -5,10 +5,13 @@ DESCRIPTION = "Command line tool for iPaq backlight control"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
-           file://nokernelheader.patch;patch=1;pnum=0"
+           file://nokernelheader.patch;patch=1;pnum=0 \
+	   file://zaurus-hinge.bl-on \
+	   file://zaurus-hinge.bl-off"
+	   
 
 S = "${WORKDIR}/h3600_test"
-PR = "r0"
+PR = "r1"
 
 inherit pkgconfig
 
@@ -22,6 +25,17 @@ do_compile (){
 }
 
 do_install () {
-        install -d ${D}${bindir}
+        install -d ${D}${bindir}	
+        install -d ${D}/etc/apm/resume.d
+	install -d ${D}/etc/zaurusd/hinge-close.d
+	install -d ${D}/etc/zaurusd/hinge-portrait.d	
+	install -d ${D}/etc/zaurusd/hinge-landscape.d	
+
         install -m 4755 ${S}/bl ${D}${bindir}/bl
-}
+	
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/apm/resume.d/00-backlight-on"		
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-landscape.d/00-backlight-on"	
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"	
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"	
+	
+}	
diff --git a/packages/bl/files/zaurus-hinge.bl-off b/packages/bl/files/zaurus-hinge.bl-off
new file mode 100644
index 0000000000..888f90bfc5
--- /dev/null
+++ b/packages/bl/files/zaurus-hinge.bl-off
@@ -0,0 +1,10 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: zaurus-hinge.bl-off
+# Date: 04-Jun-06
+
+test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
+${ZD_BINDIR}/bl off
diff --git a/packages/bl/files/zaurus-hinge.bl-on b/packages/bl/files/zaurus-hinge.bl-on
new file mode 100644
index 0000000000..6d416ad8c4
--- /dev/null
+++ b/packages/bl/files/zaurus-hinge.bl-on
@@ -0,0 +1,10 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: zaurus-hinge.bl-on
+# Date: 04-Jun-06
+
+test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
+${ZD_BINDIR}/bl on
diff --git a/packages/bootsplash/bootsplash_3.0.7.bb b/packages/bootsplash/bootsplash_3.0.7.bb
index 9ffa97d4d5..da6f75b4d3 100644
--- a/packages/bootsplash/bootsplash_3.0.7.bb
+++ b/packages/bootsplash/bootsplash_3.0.7.bb
@@ -7,7 +7,8 @@ HOMEPAGE="http://www.bootsplash.org"
 SECTION = "media-gfx"
 LICENSE = "GPL"
 SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-${PV}.tar.bz2 \
-         file://freetype2.patch;patch=1"
+         file://freetype2.patch;patch=1 \
+	 file://gcc-issues.patch;patch=1"
 
 DEPENDS="freetype libmng"
 PR = "r1"
diff --git a/packages/bootsplash/files/gcc-issues.patch b/packages/bootsplash/files/gcc-issues.patch
new file mode 100644
index 0000000000..c667fde329
--- /dev/null
+++ b/packages/bootsplash/files/gcc-issues.patch
@@ -0,0 +1,22 @@
+--- bootsplash-3.0.7/Utilities/mng.c_orig	2006-06-07 15:03:47.000000000 +0000
++++ bootsplash-3.0.7/Utilities/mng.c	2006-06-07 15:04:46.000000000 +0000
+@@ -228,7 +228,8 @@
+ 		a = a * mymng->alpha / 100;
+ 		switch (mymng->fbbpp) {
+ 		case 16:
+-			input = *((unsigned short *) background)++;
++			input = *((unsigned short *) background);
++			input = input++;
+ 
+ 			br = (input >> mng->fbredo) << (8 - mng->fbredl);
+ 			bg = (input >> mng->fbgreeno) << (8 -
+@@ -279,7 +280,8 @@
+ 						  fbgreeno) | (b << mng->
+ 							       fbblueo);
+ 
+-			*((unsigned short *) dest)++ = output;
++			output = *((unsigned short *) dest);
++			output = output++;
+ 			break;
+ 		case 24:
+ 			*dest++ = b;
diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
index 936b92bcea..52343b004e 100644
--- a/packages/cups/cups_1.1.23.bb
+++ b/packages/cups/cups_1.1.23.bb
@@ -1,4 +1,4 @@
-DEPENDS = "openssl jpeg libpng zlib"
+DEPENDS = "openssl jpeg libpng zlib install-native"
 DESCRIPTION = "An Internet printing system for Unix."
 SECTION = "console/utils"
 LICENSE = "GPL LGPL"
diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb
index c237172ac8..3313e61629 100644
--- a/packages/fbpanel/fbpanel_4.3.bb
+++ b/packages/fbpanel/fbpanel_4.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A gtk based panel application"
 SECTION = "x11"
 LICENSE = "GPL"
-DEPENDS = "gtk+"
+DEPENDS = "gtk+ libxmu libxpm"
 HOMEPAGE = "http://fbpanel.sourceforge.net/"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 SRC_URI = "${SOURCEFORGE_MIRROR}/fbpanel/fbpanel-${PV}.tgz \
diff --git a/packages/gnome/libart-lgpl/sh3/.mtn2git_empty b/packages/gnome/libart-lgpl/sh3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/libart-lgpl/sh3/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/sh3/art_config.h b/packages/gnome/libart-lgpl/sh3/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/sh3/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/gnome/libart-lgpl/sh4/.mtn2git_empty b/packages/gnome/libart-lgpl/sh4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/libart-lgpl/sh4/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/sh4/art_config.h b/packages/gnome/libart-lgpl/sh4/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/sh4/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb
new file mode 100644
index 0000000000..7ee1a1877e
--- /dev/null
+++ b/packages/gnome/libsoup_2.2.93.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
+DEPENDS = "glib-2.0 gnutls libxml2"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir} ${libdir}"
+FILES_${PN}-doc = "${datadir}"
+
+do_stage() {
+	autotools_stage_all
+	install -m 0644 ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc
+}
diff --git a/packages/gpe-conf/files/ipaq-sleep-configName.patch b/packages/gpe-conf/files/ipaq-sleep-configName.patch
new file mode 100644
index 0000000000..34f22094ad
--- /dev/null
+++ b/packages/gpe-conf/files/ipaq-sleep-configName.patch
@@ -0,0 +1,20 @@
+--- gpe-conf-0.1.30/sleep/main.c.orig	2006-06-05 12:23:34.458994776 +0200
++++ gpe-conf-0.1.30/sleep/main.c	2006-06-05 12:23:40.216119560 +0200
+@@ -23,7 +23,7 @@
+   g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
+   if(save_ISconf(ISconf, ISconf->confName)) {
+     char homeConf[MAXPATHLEN];
+-    sprintf(homeConf, "%s/ipaq-sleep.conf", getenv("HOME"));
++    sprintf(homeConf, "%s/.sleep.conf", getenv("HOME"));
+     if(!save_ISconf(ISconf, homeConf))
+       strcpy(ISconf->confName, homeConf);
+   }
+@@ -42,7 +42,7 @@
+   char cname[MAXPATHLEN];
+   GtkWidget *GPE_Config_Sleep;
+ 
+-  sprintf(cname,"%s/ipaq-sleep.conf",g_get_home_dir());
++  sprintf(cname,"%s/.sleep.conf",g_get_home_dir());
+   ISconf = load_ISconf(cname);
+   if(ISconf == NULL) {
+     strcpy(cname, "/etc/ipaq-sleep.conf");
diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb
index c0ee7e2ea0..5588420e45 100644
--- a/packages/gpe-conf/gpe-conf_0.1.30.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.30.bb
@@ -3,11 +3,12 @@ LICENSE  = "GPL"
 SECTION  = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-PR="r1"
+PR="r2"
 
 inherit gpe
 
-SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0"
+SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0 \
+	     file://ipaq-sleep-configName.patch;patch=1"
 
 DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
 RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
diff --git a/packages/ipaq-sleep/files/.mtn2git_empty b/packages/ipaq-sleep/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipaq-sleep/files/.mtn2git_empty
diff --git a/packages/ipaq-sleep/files/init-script-busybox.patch b/packages/ipaq-sleep/files/init-script-busybox.patch
new file mode 100644
index 0000000000..9a8685de68
--- /dev/null
+++ b/packages/ipaq-sleep/files/init-script-busybox.patch
@@ -0,0 +1,11 @@
+--- ipaq-sleep-0.9/ipaq-sleep.init.orig	2006-06-05 12:11:38.889777832 +0200
++++ ipaq-sleep-0.9/ipaq-sleep.init	2006-06-05 12:11:53.059623688 +0200
+@@ -9,7 +9,7 @@
+        ;;
+   stop)
+        echo -n "Stopping sleep daemon: ipaq-sleep"
+-       /sbin/start-stop-daemon --stop --quiet --oknodo --exec /usr/bin/ipaq-sleep
++       /sbin/start-stop-daemon --stop --quiet --exec /usr/bin/ipaq-sleep
+        echo "."
+        ;;
+   *)
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index a63ec83a7c..17d80eff69 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -6,5 +6,9 @@ DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
 SECTION = "x11/base"
 RDEPENDS = "apm"
 
+SRC_URI_append = " file://init-script-busybox.patch;patch=1"
+
+PR = "r1"
+
 DESCRIPTION = "Automatic sleep/suspend control daemon"
 
diff --git a/packages/libeventdb/libeventdb_0.30.bb b/packages/libeventdb/libeventdb_0.30.bb
index 30dc81c34c..38d48098d6 100644
--- a/packages/libeventdb/libeventdb_0.30.bb
+++ b/packages/libeventdb/libeventdb_0.30.bb
@@ -1,3 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
 LICENSE     = "LGPL"
 DESCRIPTION = "Database access library for GPE calendar"
 SECTION  = "gpe/libs"
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index 42654231c5..bded954bb3 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Library for parsing CORBA IDL files"
 SECTION = "gnome/libs"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 libidl-native"
 PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
diff --git a/packages/libmng/libmng_1.0.8.bb b/packages/libmng/libmng_1.0.8.bb
index eb17d8c6b3..9619cf4c53 100644
--- a/packages/libmng/libmng_1.0.8.bb
+++ b/packages/libmng/libmng_1.0.8.bb
@@ -16,6 +16,9 @@ do_compile() {
 
 do_stage() {
 	oe_libinstall -so libmng ${STAGING_LIBDIR}
+        install -m 0644 ${S}/libmng.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/libmng_conf.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/libmng_types.h ${STAGING_INCDIR}/
 }
 
 do_install() {
diff --git a/packages/linux/linux-ezx/a780-leds-r0.patch b/packages/linux/linux-ezx/a78