merge of '166f244ef427b574bc894a4585b773997e302e97'

     and '86d064241f76c59a2663d25f57ee15ef950bee4b'

103 files changed, 5928 insertions, 105 deletions

diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 3968bcb6f2..95be1624f0 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySA0"
+SERIAL_CONSOLE = "38400 ttySA0"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 4e6c9a625a..3d1b602def 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
 
 #
 # Software/packages selection
@@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \
 	kernel-module-pxaficp-ir \
 	kernel-module-uinput \
 	kernel-module-hci-usb \
-	"
+	kernel-module-magician-flash \
+	kernel-module-magician-ds1wm \
+	kernel-module-magician-battery \
+	kernel-module-magician-phone \
+	kernel-module-snd-soc-magician"
 
 #
 # Modules autoload and other boot properties
@@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_magician_ds1wm = "magician_ds1wm"
+module_autoload_magician-battery = "magician-battery"
+module_autoload_magician_phone = "magician_phone"
+module_autoload_snd-soc-magician = "snd-soc-magician"
+module_autoload_hci_usb = "hci_usb"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
new file mode 100644
index 0000000000..cd95777227
--- /dev/null
+++ b/packages/abiword/abiword-2.5.inc
@@ -0,0 +1,62 @@
+DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
+SECTION = "gnome/office"
+HOMEPAGE = "http://www.abiword.org""
+LICENSE = "GPLv2"
+
+DEPENDS     = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+
+#want 2.x from 2.x.y for the installation directory
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+FILES_${PN} += " \
+		${datadir}/icons/* \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \
+#		${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \
+#		${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt "
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = " --disable-pspell \
+                 --enable-enchant \
+		 --with-sys-wv"
+
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
+#
+do_configure() {
+        cd ${S}
+        export NOCONFIGURE="no"; ./autogen.sh
+        oe_runconf
+}
+
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
+
+FILES_abiword-clipart 		+= "${datadir}/AbiSuite-${SHRT_VER}/clipart"
+FILES_abiword-icons 		+= "${datadir}/AbiSuite-${SHRT_VER}/icons"
+FILES_abiword-strings 		+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles 	+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates 	+= "${datadir}/AbiSuite-${SHRT_VER}/templates"
diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb
new file mode 100644
index 0000000000..82d4e0e944
--- /dev/null
+++ b/packages/abiword/abiword_2.5.0.bb
@@ -0,0 +1,14 @@
+require abiword-2.5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += " file://cdump.pl "
+
+PR = "r0"
+
+RCONFLICTS = "abiword-embedded"
+
+do_compile_prepend () {
+	cp ${WORKDIR}/cdump.pl ${S}/src/tools/cdump/xp/
+}
+
diff --git a/packages/abiword/files/cdump.pl b/packages/abiword/files/cdump.pl
new file mode 100755
index 0000000000..76f9c8841b
--- /dev/null
+++ b/packages/abiword/files/cdump.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+
+# This script replace th