merge of 295b25bdccb71c5cb89674e861313d3fc4dd8aa8

     and 6311b4a3e3e4d0a0680848dadc193d5790149001

2 files changed, 66 insertions, 49 deletions

diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
index 4a6bca982d..5f42a3db51 100644
--- a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
@@ -1,6 +1,6 @@
-keymaps 0-1,4-5
+keymaps 0-2,4-5
 alt_is_meta
-keycode   1 = a               
+keycode   1 = a              
 keycode   2 = b               
 keycode   3 = c               
 keycode   4 = d               
@@ -31,35 +31,37 @@ keycode  28 = Return
 keycode  29 = F11              
 keycode  30 = AltGr
 keycode  31 = BackSpace       
-keycode  32 = bar             
+keycode  32 = Num_Lock             
 keycode  33 = F15 
 keycode  34 = Escape          
-keycode  35 = Left            
+keycode  35 = Left           
+	altgr keycode 35 = Decr_Console
 keycode  36 = Up              
 keycode  37 = Down            
 keycode  38 = Right           
+	altgr keycode 38 = Incr_Console
 keycode  39 = Return          
 keycode  40 = F12
-keycode  41 = one             
-keycode  42 = two             
-keycode  43 = three           
-keycode  44 = four            
-keycode  45 = five            
-keycode  46 = six             
-keycode  47 = seven           
-keycode  48 = eight           
-keycode  49 = nine            
-keycode  50 = zero            
-keycode  51 = +adiaeresis      
-keycode  52 = +udiaeresis      
-keycode  53 = +odiaeresis      
-keycode  54 = +Adiaeresis      
-keycode  55 = +Udiaeresis      
-keycode  56 = +Odiaeresis      
-keycode  57 = +ssharp          
+keycode  41 = one             exclam
+keycode  42 = two             quotedbl
+keycode  43 = three           numbersign
+keycode  44 = four            dollar
+keycode  45 = five            percent
+keycode  46 = six             ampersand
+keycode  47 = seven           apostrophe
+keycode  48 = eight           parenleft
+keycode  49 = nine            parenright
+keycode  50 = zero            asciitilde
+keycode  51 = minus           equal
+keycode  52 = asciicircum     asciitilde
+keycode  53 = backslash       bar
+keycode  54 = bracketleft     braceleft
+keycode  55 = at              grave
+keycode  56 = Control      
+keycode  57 = Alt          
 keycode  58 = minus           
 keycode  59 = plus            
-keycode  60 = Shift_Lock      
+keycode  60 = Caps_Lock      
 keycode  61 = at              
 keycode  62 = question        
 keycode  63 = comma           
@@ -94,38 +96,38 @@ keycode  91 = space
 	control	keycode  91 = nul             
 keycode  92 = space           
 	control	keycode  92 = nul             
-keycode  93 =
-keycode  94 = exclam          
-keycode  95 =
-keycode  96 =
-keycode  97 =
-keycode  98 =
-keycode  99 =
-keycode 100 =
-keycode 101 =
-keycode 102 =
+keycode  93 =  
+keycode  94 = AltGr          
+keycode  95 = semicolon
+keycode  96 = colon
+keycode  97 = bracketright
+keycode  98 = comma
+keycode  99 = period
+keycode 100 = slash
+keycode 101 = underscore
+keycode 102 = F15
 keycode 103 = Shift           
-keycode 104 = Control         
-keycode 105 = Control         
-keycode 106 = Alt             
-keycode 107 = Alt             
+keycode 104 = Find         
+keycode 105 = Select         
+keycode 106 = Prior             
+keycode 107 = Next             
 keycode 108 = AltGr           
-keycode 109 =
-keycode 110 =
+keycode 109 = F31
+keycode 110 = 
 keycode 111 =
-keycode 112 =
+keycode 112 = Shift
 keycode 113 =
 keycode 114 =
 keycode 115 =
 keycode 116 =
-keycode 117 =
+keycode 117 = Control
 keycode 118 =
 keycode 119 =
 keycode 120 = F24
-keycode 121 =
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 =
-keycode 126 =
+keycode 121 = Left
+keycode 122 = Up
+keycode 123 = Down
+keycode 124 = Right
+keycode 125 = Up
+keycode 126 = Down
 keycode 127 =
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 565988763b..9be1e321bd 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,7 +1,11 @@
-PR      = "r4"
+DESCRIPTION = "Meta package for SDK including GPE and Opie"
 LICENSE = MIT
-DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
-DEPENDS += "libidl libsvg-cairo sed-native"
+DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \
+           binutils-cross-sdk gcc-cross-sdk gdb-cross \
+           libidl libsvg-cairo sed-native \
+           meta-gpe \
+           opie-mail"
+PR = "r5"
 
 PACKAGES = ""
 
@@ -29,6 +33,7 @@ libaudiofile-dev \
 libbluetooth-dev \
 libcairo-dev \
 libdisplaymigration-dev \
+libetpan-dev \
 libesd-dev \
 libeventdb-dev \
 libexpat-dev \
@@ -46,14 +51,24 @@ libice-dev \
 libidl-2-dev \
 libipkg-dev \
 libjpeg-dev \
+libmailwrapper-dev \
 libmb-dev \
 libmimedir-dev \
 libopenobex-1.0-dev \
+libopiebluez2-dev \
+libopiedb2-dev \
+libopiecore2-dev \
+libopienet2-dev \
+libopiepim2-dev \
+libopieui2-dev \
 libpcap-dev \
 libpixman-dev \
 libpng-dev \
 libpng12-dev \
 libpopt-dev \
+libqpe1-dev \
+libqte2-dev \
+libqtaux2-dev \
 libreadline-dev \
 libschedule-dev \
 libsm-dev \