merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d

     and e84b72e0b67ac92d81d1f7a72737dd8286340e5d

12 files changed, 72 insertions, 12 deletions

diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index 31e2edb831..06b9672504 100644
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -2,6 +2,11 @@
 /dev/mtdblock3	/home 	jffs2	defaults,noatime	1  2
 proc		/proc	proc	defaults	0  0
 /dev/hda1	/media/cf	auto	defaults,sync,noauto	0  0
+
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
+
+# SD/MMC in kernel 2.4
 /dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
 
 tmpfs		/var		tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 8fec5b01d4..cbf0cc772a 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r49"
+PR = "r50"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
new file mode 100644
index 0000000000..6408ef9551
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig	2006-05-14 13:24:01.354435088 +0200
++++ linux-2.6.16/drivers/video/backlight/locomolcd.c	2006-05-14 13:24:11.920828752 +0200
+@@ -201,7 +201,7 @@
+ 		return PTR_ERR (locomolcd_bl_device);
+ 
+ 	/* Set up frontlight so that screen is readable */
+-	locomobl_data.brightness = 2;
++	locomobl_data.brightness = 3;
+ 	locomolcd_set_intensity(locomolcd_bl_device);
+ 
+ 	return 0;
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
index 365ee1366e..94dabf4384 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
@@ -11,13 +11,13 @@
 -#define LOCOMO_KEY_MAIL		KEY_F10
 -#define LOCOMO_KEY_OK		KEY_F11
 +#define LOCOMO_KEY_CALENDER	KEY_LEFTCTRL
-+#define LOCOMO_KEY_ADDRESS	KEY_LEFTALT	/* Needed SysRQ */
-+#define LOCOMO_KEY_HOME		KEY_SYSRQ	/* Need that for SysRQ */
++#define LOCOMO_KEY_ADDRESS	KEY_LEFTALT	/* Needed for SysRQ */
++#define LOCOMO_KEY_HOME		KEY_SYSRQ	/* Needed for SysRQ */
  #define LOCOMO_KEY_MENU		KEY_F12
 +#define LOCOMO_KEY_MAIL		KEY_F10
-+#define LOCOMO_KEY_OK		KEY_F11		/* Don't hardwire to KP_RETURN */
++#define LOCOMO_KEY_OK		KEY_F11		/* Don't hardwire to KEY_RETURN */
 +#define LOCOMO_KEY_CANCEL	KEY_POWER
-+#define LOCOMO_KEY_CENTER	KEY_F5		/* Don't hardwire to KP_RETURN */
++#define LOCOMO_KEY_CENTER	KEY_F5		/* Don't hardwire to KEY_RETURN */
 +
 +#define LOCOMO_KEY_FN		KEY_F9
  
@@ -60,7 +60,7 @@
  			scancode = SCANCODE(col, row);
  			if (rowd & KB_ROWMASK(row)) {
 -				/* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */
-+				printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]);
++				/* printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]); */
  				num_pressed += 1;
  				input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
  			} else {
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 3ad68d1a69..1a75f350b8 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r23"
+PR = "r25"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -95,6 +95,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
 	   file://locomo-kbd-hotkeys.patch;patch=1 \
 	   file://locomo-sysrq+keyrepeat.patch;patch=1 \
+	   file://locomo-lcd-def-bightness.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults
index 38a18e6a9f..f560889927 100644
--- a/packages/opie-taskbar/opie-taskbar/opie_defaults
+++ b/packages/opie-taskbar/opie-taskbar/opie_defaults
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`"
+KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`"
+
+case "$MACHINE" in
+*Poodle)	test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;;
+esac
+
 export PATH="$PATH:/opt/QtPalmtop/bin"
 export QTDIR="/opt/QtPalmtop"
 
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index a3b05d4294..1c6f764867 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,5 +1,5 @@
 include ${PN}.inc
-PR = "r1" 
+PR = "r2" 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 49ca24b725..1fe08a8c1b 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 822ee2402f..6b30bb6fe1 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -46,6 +46,7 @@ SRC_URI_append_c7x0         = "file://kernel-keymap.patch;patch=1;pnum=0 file://
                                file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 "
 SRC_URI_append_spitz        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
 SRC_URI_append_akita        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 "
+SRC_URI_append_poodle       = "file://kernel-keymap.patch;patch=1;pnum=0 "
 SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 25741931e6..89c997d40c 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -1,3 +1,3 @@
 require qte-common_${PV}.inc
-PR = "r40"
+PR = "r41"
 
diff --git a/packages/zaurusd/files/add-poodle.patch b/packages/zaurusd/files/add-poodle.patch
new file mode 100644
index 0000000000..4f91413668
--- /dev/null
+++ b/packages/zaurusd/files/add-poodle.patch
@@ -0,0 +1,34 @@
+diff -Nur zaurusd.orig/config/mach-config/mach-poodle-functions zaurusd/config/mach-config/mach-poodle-functions
+--- zaurusd.orig/config/mach-config/mach-poodle-functions	1970-01-01 01:00:00.000000000 +0100
++++ zaurusd/config/mach-config/mach-poodle-functions	2006-05-14 12:43:01.000000000 +0200
+@@ -0,0 +1,3 @@
++#HAVE_INPUT_SWITCHES=1
++#HAVE_ALSA_MIXER=1
++
+diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-config/mach-poodle-vars
+--- zaurusd.orig/config/mach-config/mach-poodle-vars 1970-01-01 01:00:00.000000000 +0100
++++ zaurusd/config/mach-config/mach-poodle-vars	2006-05-14 12:42:42.000000000 +0200
+@@ -0,0 +1,9 @@
++MACHINE=poodle
++
++export SWITCH_EVENT_ZMIXER=1
++SWITCH_EVENT_DEVICE=/dev/input/event0
++
++#TSKEYS_CONF=@appconfdir@/tskeys/zaurus-clamshell.conf
++#TSKEYS_DEVICE=/dev/input/event1
++
++ALSA_MIXER_INIT=@appconfdir@/alsa/poodle-default.state
+\ Kein Zeilenumbruch am Dateiende.
+diff -Nur zaurusd.orig/scripts/detect-machine zaurusd/scripts/detect-machine
+--- zaurusd.orig/scripts/detect-machine	2006-05-07 13:39:11.000000000 +0200
++++ zaurusd/scripts/detect-machine	2006-05-14 12:40:38.000000000 +0200
+@@ -27,6 +27,9 @@
+         "SHARP Tosa")
+ 		MACHINE=tosa
+         	;;	
++	"SHARP Poodle")
++		MACHINE=poodle
++		;;
+ 	"Simpad")
+ 		;;
+ 	"HP iPAQ H2200")
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index ec385d4934..89291c4101 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,10 +4,11 @@ MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
 LICENSE = "GPL"
 DEPENDS = "tslib"
 PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
-           file://zaurus-hinge.in"
+           file://zaurus-hinge.in \
+	   file://add-poodle.patch;patch=1"
 
 S = "${WORKDIR}/${PN}"