merge of 0d3287a95928eaa1b09e468ef501316c65f16248

     and bc3daa844870742c024624bb588b3a94af824c6d

5 files changed, 207 insertions, 4 deletions

diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
new file mode 100644
index 0000000000..f76d83e3ad
--- /dev/null
+++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
@@ -0,0 +1,72 @@
+--- src/gpsdrive.c	2005-07-22 23:17:36.452918848 +0200
++++ src/gpsdrive.c	2005-07-23 01:02:40.482560672 +0200
+@@ -10516,7 +10516,7 @@
+ 			PangoFontDescription *font_desc;
+ 			font_desc =
+ 				pango_font_description_from_string
+-				("Sans 20");
++				("Sans 10");
+ 			gtk_widget_modify_font (myroutelist, font_desc);
+ 			pango_font_description_free (font_desc);
+ 		}
+@@ -12343,6 +12343,8 @@
+ 			       GDK_BUTTON_PRESS_MASK);
+ 	gtk_signal_connect (GTK_OBJECT (drawing_sats), "button-press-event",
+ 			    GTK_SIGNAL_FUNC (satpos_cb), NULL);
++        if(!pdamode)
++	{
+ 	frame_sats = gtk_frame_new (_("GPS Info"));
+ 	sateventbox = gtk_event_box_new ();
+ 	gtk_container_add (GTK_CONTAINER (sateventbox), drawing_sats);
+@@ -12386,7 +12388,7 @@
+ 
+ 	gtk_box_pack_start (GTK_BOX (hbox2), frame_sats, FALSE, FALSE,
+ 			    1 * PADDING);
+-
++	}
+ 	havebattery = battery_get_values ();
+ 	if (debug)
+ 		fprintf (stderr, "batt: %d, temp: %d\n", havebattery,
+@@ -12569,9 +12571,11 @@
+ 	/*   if (!pdamode) */
+ 	/*     gtk_box_pack_start (GTK_BOX (hbox2), frame_speed, TRUE, TRUE, */
+ 	/*                  1 * PADDING); */
+-
++	if (!pdamode)
++	{
+ 	frame_altitude = gtk_frame_new (_("Altitude"));
+ 	gtk_container_add (GTK_CONTAINER (frame_altitude), altilabel);
++	}
+     /*** Mod by Arms */
+ 	/*   if (!pdamode) */
+ 	/*     gtk_box_pack_start (GTK_BOX (hbox2), frame_altitude, FALSE, TRUE, */
+@@ -12904,23 +12908,23 @@
+ 		if (onemousebutton)
+ 		{
+ 			/* gtk_misc_set_padding (GTK_MISC (l1), x, y); */
+-			gtk_misc_set_padding (GTK_MISC (l1), 50, 1);
+-			gtk_misc_set_padding (GTK_MISC (l2), 50, 1);
+-			gtk_misc_set_padding (GTK_MISC (l3), 50, 1);
++			gtk_misc_set_padding (GTK_MISC (l1), 20, 1);
++			gtk_misc_set_padding (GTK_MISC (l2), 20, 1);
++			gtk_misc_set_padding (GTK_MISC (l3), 20, 1);
+ 
+ 			/* http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html */
+ 
+ 			char *markup;
+ 			markup = g_markup_printf_escaped
+-				("<span weight='heavy' stretch='ultraexpanded'  size='20480'>%s</span>",
++				("<span font_desc='10'>%s</span>",
+ 				 _("Map"));
+ 			gtk_label_set_markup (GTK_LABEL (l1), markup);
+ 			markup = g_markup_printf_escaped
+-				("<span weight='heavy' stretch='ultraexpanded'  size='20480'>%s</span>",
++				("<span font_desc='10'>%s</span>",
+ 				 _("Menu"));
+ 			gtk_label_set_markup (GTK_LABEL (l2), markup);
+ 			markup = g_markup_printf_escaped
+-				("<span weight='heavy' stretch='ultraexpanded'  size='20480'>%s</span>",
++				("<span font_desc='10'>%s</span>",
+ 				 _("Status"));
+ 			gtk_label_set_markup (GTK_LABEL (l3), markup);
+ 
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index cc623451ef..ba4432f5ca 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -1,6 +1,6 @@
 inherit autotools pkgconfig
 
-PR = "r0"
+PR = "r1"
 PV = "2.10pre3+cvs-${CVSDATE}"
 DEFAULT_PREFERENCE="-1"
 
@@ -14,6 +14,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 
 SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \
+	   file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \
            file://gpsdrive.desktop"
 
 S = "${WORKDIR}/gpsdrive"
diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
new file mode 100644
index 0000000000..4a6bca982d
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
@@ -0,0 +1,131 @@
+keymaps 0-1,4-5
+alt_is_meta
+keycode   1 = a               
+keycode   2 = b               
+keycode   3 = c               
+keycode   4 = d               
+keycode   5 = e               
+keycode   6 = f               
+keycode   7 = g               
+keycode   8 = h               
+keycode   9 = i               
+keycode  10 = j               
+keycode  11 = k               
+keycode  12 = l               
+keycode  13 = m               
+keycode  14 = n               
+keycode  15 = o               
+keycode  16 = p               
+keycode  17 = q               
+keycode  18 = r               
+keycode  19 = s               
+keycode  20 = t               
+keycode  21 = u               
+keycode  22 = v               
+keycode  23 = w               
+keycode  24 = x               
+keycode  25 = y               
+keycode  26 = z               
+keycode  27 = Shift           
+keycode  28 = Return          
+keycode  29 = F11              
+keycode  30 = AltGr
+keycode  31 = BackSpace       
+keycode  32 = bar             
+keycode  33 = F15 
+keycode  34 = Escape          
+keycode  35 = Left            
+keycode  36 = Up              
+keycode  37 = Down            
+keycode  38 = Right           
+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  58 = minus           
+keycode  59 = plus            
+keycode  60 = Shift_Lock      
+keycode  61 = at              
+keycode  62 = question        
+keycode  63 = comma           
+keycode  64 = period          
+keycode  65 = Tab             
+keycode  66 = F5              
+keycode  67 = F6              
+keycode  68 = F7              
+keycode  69 = slash           
+keycode  70 = apostrophe      
+keycode  71 = semicolon       
+keycode  72 = quotedbl        
+keycode  73 = colon           
+keycode  74 = numbersign      
+keycode  75 = dollar          
+keycode  76 = percent         
+keycode  77 = underscore      
+keycode  78 = ampersand       
+keycode  79 = asterisk        
+keycode  80 = parenleft       
+keycode  81 = Delete          
+keycode  82 = F10             
+keycode  83 = equal           
+keycode  84 = parenright      
+keycode  85 = asciitilde      
+keycode  86 = less            
+keycode  87 = greater         
+keycode  88 = F9              
+keycode  89 = F10             
+keycode  90 = F13             
+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 103 = Shift           
+keycode 104 = Control         
+keycode 105 = Control         
+keycode 106 = Alt             
+keycode 107 = Alt             
+keycode 108 = AltGr           
+keycode 109 =
+keycode 110 =
+keycode 111 =
+keycode 112 =
+keycode 113 =
+keycode 114 =
+keycode 115 =
+keycode 116 =
+keycode 117 =
+keycode 118 =
+keycode 119 =
+keycode 120 = F24
+keycode 121 =
+keycode 122 =
+keycode 123 =
+keycode 124 =
+keycode 125 =
+keycode 126 =
+keycode 127 =
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index f61f1e8128..76755e1744 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r50"
+PR = "r51"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb
index bcf723a0c6..7f8fd42a4b 100644
--- a/packages/libusb/libusb_0.1.10a.bb
+++ b/packages/libusb/libusb_0.1.10a.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "libusb is a library to provide userspace \
 access to USB devices."
 SECTION = "libs"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
-	file://ARMfix.patch;patch=1 \ 
 	file://debian-changes.patch;patch=1" 
 
 inherit autotools pkgconfig