4 files changed, 41 insertions, 10 deletions
diff --git a/packages/gpe-session-scripts/files/shepherd.xmodmap b/packages/gpe-session-scripts/files/shepherd.xmodmap
index 066b1104da..0a03b4f426 100644
--- a/packages/gpe-session-scripts/files/shepherd.xmodmap
+++ b/packages/gpe-session-scripts/files/shepherd.xmodmap
@@ -6,7 +6,8 @@ keycode 28 = t T bracketleft
 keycode 33 = y y bracketright
 keycode 29 = u U braceleft
 keycode 17 = i I braceright
-keycode 12 = d D period
+!keycode 73 = Tab Tab Caps_Lock
+keycode 12 = d D periodcentered
 keycode 14 = f F backslash
 keycode 15 = g G semicolon
 keycode 16 = h H colon
@@ -15,9 +16,34 @@ keycode 19 = k K currency
 keycode 20 = l L bar
 keycode 10 = b B underscore
 keycode 66 = minus minus at
-keycode 71 = slash slash less
-keycode 72 = question question greater
+keycode 71 = comma slash less
+keycode 72 = period question greater
 
-remove mod1 = Mode_switch
-add mod2 = Mode_switch
+! Side keys
+keycode 134 = Down
+keycode 133 = Up
+keycode 131 = Return
+keycode 132 = Escape
+
+!Special keys
+!keycode 96 = XF86Calendar
+!keycode 97 = telephone
+!keycode 98 = XF86Mail
+!keycode 48 = XF86HomePage
+!keycode 37 = XF86Start
+
+clear Shift
+clear Lock
+clear Control
+clear Mod1
+clear Mod2
+clear Mod3
+clear Mod4
+clear Mod5
+
+add Shift   = Shift_L Shift_R
+!add Lock    = Caps_Lock
+add Control = Control_L Control_R
+add Mod1    = Alt_L Alt_R
+add Mod2 = Mode_switch
 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index dc758aee11..4b55b3aecd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 inherit gpe
 
diff --git a/packages/kbdd/kbdd_20040904.bb b/packages/kbdd/kbdd_20040904.bb
index cb827cab80..858dd1fdf9 100644
--- a/packages/kbdd/kbdd_20040904.bb
+++ b/packages/kbdd/kbdd_20040904.bb
@@ -1,5 +1,7 @@
 SECTION = "unknown"
 SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV}"
+DEFAULT_PREFERENCE="-1"
+
 
 S = "${WORKDIR}/kbdd"
 LICENSE = "GPL"
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 6a286ccc27..dd15eacb1c 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
 
@@ -27,6 +27,7 @@ libatk-1.0-dev \
 libaudiofile-dev \
 libbluetooth-dev \
 libcairo-dev \
+libdisplaymigration-dev \
 libesd-dev \
 libeventdb-dev \
 libexpat-dev \
@@ -37,6 +38,7 @@ libglade-2.0-dev \
 libglib-2.0-dev \
 libgpelaunch-dev \
 libgpepimc-dev \
+libgpevtype-dev \
 libgpewidget-dev \
 libgpg-error-dev \
 libice-dev \
@@ -124,7 +126,8 @@ EOF
 	mkdir -p ${SDK_OUTPUT}
 	
 	${IPKG_HOST} update
-	${IPKG_HOST} --nodeps install ${HOST_INSTALL}
+	${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+
 	${IPKG_TARGET} update
 	${IPKG_TARGET} install ${TARGET_INSTALL}
 
@@ -134,7 +137,8 @@ EOF
 
         cp -a ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
         rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
-	mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib
+
+	mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
 
 	cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
         cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
@@ -143,7 +147,6 @@ EOF
 
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
-
 	# remove unwanted housekeeping files
 	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
 	rm -rf ${SDK_OUTPUT}/usr/lib/ipkg