merge of '1161b24f978165b889f1fc52b8f6168a4d0ce9dc'

and '7922bd128efa4e3b482c762de566056c93ec064e'
author: Paul Sokolovsky <pmiscml@gmail.com> 2007-03-30 15:46:43 +0000
committer: Paul Sokolovsky <pmiscml@gmail.com> 2007-03-30 15:46:43 +0000
commit: f673b8d213609a6b90b2f923b2cc96e6c0c820a2 (patch)
tree: 66ed165ef14b03ca15fa7bf488f4e4aa67ede648
parent: a31229ef8c96e6ad6dbe5c7b9c78639354b73ec0 (diff)
parent: c5747068f49e45234934ba5ab067e0a4ee589c2a (diff)
36 files changed, 604 insertions, 595 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 7b888b9d5f..eef4c4d06f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -36,7 +36,7 @@ SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
-SRCDATE_psplash ?= "20061207"
+SRCDATE_psplash ?= "20070330"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
 
diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf
index b5dba1ffed..42ae98fab1 100644
--- a/conf/distro/openzaurus-3.5.5.conf
+++ b/conf/distro/openzaurus-3.5.5.conf
@@ -140,6 +140,8 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.7"
 PREFERRED_VERSION_hostap-utils ?= "0.4.7"
 PREFERRED_VERSION_hostap-modules ?= "0.4.7"
 
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
+
 #
 # We do not use qte-mt to keep compatibility with older OZ
 #
diff --git a/packages/altboot/README.txt b/packages/altboot/README.txt
index 07a41bef3d..ed71b03957 100644
--- a/packages/altboot/README.txt
+++ b/packages/altboot/README.txt
@@ -2,4 +2,4 @@ altboot_1.0.5.bb		- Last known-working version for clamshell
 				  Zauruses running kernel 2.4
 altboot_1.0.8.bb		- Last known-working version for all Zauruses
 altboot_1.1.1+wip-20061123.bb	- Last known-working version for neo1973
-altboot_wip.bb
+altboot_svn.bb			- Altboot developer snapshot - avoid ;)
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index baf5116d70..d31c5160a2 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -65,6 +65,8 @@ do_install() {
 	install -m 0644 ${S}/altbootctl.conf ${D}/etc
 	install -m 0755 ${S}/init.altboot ${D}/sbin
 	install -m 0755 ${S}/altbootctl ${D}/sbin
+	
+	ln -s /sbin/init.altboot ${D}/sbin/altboot
 
 	install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
 
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index fb71361a1d..72583cb7e9 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR="r1"
+PR="r2"
 
 DEPENDS = "expat libdaemon dbus glib-2.0"
 RRECOMMENDS = "libnss-mdns"
@@ -55,8 +55,8 @@ pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+	grep "^avahi:" /etc/group > /dev/null || addgroup avahi
+	grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
 
 	DBUSPID=`pidof dbus-daemon`
 
@@ -70,8 +70,8 @@ pkg_postinst_avahi-autoipd () {
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-	grep avahi-autoipd /etc/group || addgroup avahi-autoipd
-	grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon"
+	grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd
+	grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon"
 }
 
 pkg_postrm_avahi-daemon () {
diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb
index b48ebb79f6..d072b85bac 100644
--- a/packages/btxml/btxml.bb
+++ b/packages/btxml/btxml.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Bluetooh Download Data from remote phones"
-PRIORITY = "optional"
-SECTIONS = "apps"
-DEPENDS = "bluez-libs"
 HOMEPAGE = "http://www.saftware.de"
+SECTION = "apps"
+PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "bluez-libs"
 
 SRC_URI = "http://www.saftware.de/bluetooth/btxml.c"
 S = "${WORKDIR}"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth.inc b/packages/gpe-bluetooth/gpe-bluetooth.inc
new file mode 100644
index 0000000000..c258832c8b
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION = "gpe"
+LICENSE = "GPL"
+PRIORITY = "optional"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
index f3129fcf17..396beeb014 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
@@ -1,12 +1,3 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support"
-SECTION = "gpe"
-PRIORITY = "optional"
+require gpe-bluetooth.inc
 
 DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
index 15d8ccafcc..98cdbc4b7f 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -1,16 +1,6 @@
-LICENSE     = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY    = "optional"
-PR          = "r1"
+require gpe-bluetooth.inc
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+PR = "r1"
 
 do_configure () {
 	autotools_do_configure
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
index b6dcfcca61..66bc3f0b24 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
@@ -1,13 +1 @@
-LICENSE     = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY    = "optional"
-PR          = "r0"
-
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+require gpe-bluetooth.inc
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
index b6dcfcca61..66bc3f0b24 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
@@ -1,13 +1 @@
-LICENSE     = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY    = "optional"
-PR          = "r0"
-
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
+require gpe-bluetooth.inc
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
index e664f51959..9164cc4088 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -1,16 +1,6 @@
-LICENSE     = "GPL"
-DESCRIPTION = "GPE bluetooth support user interface tool."
-SECTION = "gpe"
-PRIORITY    = "optional"
-PR          = "r1"
+require gpe-bluetooth.inc
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
+PR = "r1"
 
 SRC_URI += "file://hciattach-bts.patch;patch=1 \
 	file://include-sdp_lib.patch;patch=1"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd
index 4b8db5d5a5..5c78e8178a 100644
--- a/packages/gsm/files/gsmd
+++ b/packages/gsm/files/gsmd
@@ -16,21 +16,21 @@ RETVAL=0
 prog="gsmd"
 
 start() {
-	# FIXME add check whether GSM_POW is set at all, otherwise don't try to power on
-	# Power on GSM device
-	
 	# Hack for broken uboot and/or kernel on the neo1973
 	dmesg -n1
 
-	if [ -e "${GSM_POW}" ]
+	if [ -n "${GSM_POW}" ]
 	then
-		echo -n "Powering up GSM device..."
-		echo "1" > ${GSM_POW}
-		sleep 1
-		echo "done"
-	else
-		echo "GSM device not found. Aborting startup"
-		return false
+		if [ -e "${GSM_POW}" ]
+		then
+			echo -n "Powering up GSM device..."
+			echo "1" > ${GSM_POW}
+			sleep 1
+			echo "done"
+		else
+			echo "GSM device not found. Aborting startup"
+			return false
+		fi
 	fi
 	# Start daemons.
 	echo -n "Starting $prog: "
diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default
index fb19d46fd5..a9c3b94b1d 100644
--- a/packages/gsm/files/magician/default
+++ b/packages/gsm/files/magician/default
@@ -1,7 +1,7 @@
 # gsmd	This shell script configures for the gsmd init script.
 
-# If you must specify special options, uncomment and modify the next line
-GSMD_OPTS="-s 115200 -F"
+# Set line Discipline 17 (N_TIHTC), needs ldisc.patch-ed gsmd
+GSMD_OPTS="-s 115200 -F -D 17"
 
 # If your GSM device needs to be powered up, uncomment and modify the next line
 #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 910fa26d4d..0b3a29e931 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb
new file mode 100644
index 0000000000..94471a26fc
--- /dev/null
+++ b/packages/liboil/liboil_0.3.11.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig
index 536133f6aa..68dcca286d 100644
--- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig
+++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig
@@ -1,53 +1,68 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hnd0
-# Thu Dec 14 14:24:35 2006
+# Linux kernel version: 2.6.20-hnd0
+# Wed Mar 28 10:35:44 2007
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_IPC_NS is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
-# CONFIG_MINIMAL_OOPS is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_UID16=y
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
-CONFIG_ELF_CORE=y
+# CONFIG_ELF_CORE is not set
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_USELIB=y
-CONFIG_CORE_DUMP=y
 CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -60,19 +75,22 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
@@ -83,18 +101,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -102,12 +130,6 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
 
 #
 # Intel PXA2xx Implementations
@@ -116,12 +138,14 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
 # CONFIG_ARCH_ESERIES is not set
 # CONFIG_MACH_A620 is not set
 # CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
 # CONFIG_ARCH_H1900 is not set
 # CONFIG_ARCH_H2200 is not set
-# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H3900 is not set
 # CONFIG_MACH_H4000 is not set
 # CONFIG_MACH_H4700 is not set
 # CONFIG_MACH_HX2750 is not set
@@ -133,27 +157,32 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_HW6900 is not set
 # CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_X50 is not set
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
 # CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_XSCALE_PALMTREO650 is not set
+# CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
 # CONFIG_MACH_TUNGE2 is not set
 # CONFIG_MACH_T3XSCALE is not set
 # CONFIG_MACH_XSCALE_PALMTT5 is not set
 CONFIG_MACH_XSCALE_PALMTX=y
-CONFIG_PALMTX_AC97=m
-CONFIG_PALMTX_LCD=m
 # CONFIG_PALMTX_PCMCIA is not set
 # CONFIG_PALMTX_DEBUG is not set
+CONFIG_PALMTX_BATTERY=m
+CONFIG_PALMTX_PM=y
 # CONFIG_MACH_PALMZ72 is not set
 # CONFIG_MACH_OMAP_PALMTC is not set
+# CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=m
+CONFIG_GPIOEDNG=m
 # CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
-CONFIG_PXA_RTC_EPOCH=1970
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
 
 #
 # Linux As Bootloader
@@ -169,27 +198,26 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_IWMMXT=y
 # CONFIG_ARMBOOT_PROC is not set
 CONFIG_XSCALE_PMU=y
 # CONFIG_KEXEC is not set
 
 #
-# Compaq/iPAQ Platforms
-#
-
-#
 # Compaq/iPAQ Drivers
 #
 
 #
 # Compaq/HP iPAQ Drivers
 #
-# CONFIG_IPAQ_HAMCOP is not set
 
 #
 # Bus support
@@ -203,9 +231,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Kernel Features
 #
-# CONFIG_PREEMPT is not set
-CONFIG_NO_IDLE_HZ=y
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -215,6 +245,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -247,13 +278,16 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
 #
-# CONFIG_PM is not set
-# CONFIG_APM is not set
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_DPM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM=y
 
 #
 # Networking
@@ -264,12 +298,13 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
-CONFIG_NET_KEY=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -284,13 +319,19 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
 #
@@ -316,7 +357,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -330,22 +370,22 @@ CONFIG_TCP_CONG_BIC=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
+CONFIG_IRDA=y
 
 #
 # IrDA protocols
 #
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
+# CONFIG_IRLAN is not set
+# CONFIG_IRNET is not set
 CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
+# CONFIG_IRDA_ULTRA is not set
 
 #
 # IrDA options
 #
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 # CONFIG_IRDA_FAST_RR is not set
-CONFIG_IRDA_DEBUG=y
+# CONFIG_IRDA_DEBUG is not set
 
 #
 # Infrared-port device drivers
@@ -354,29 +394,43 @@ CONFIG_IRDA_DEBUG=y
 #
 # SIR device drivers
 #
-CONFIG_IRTTY_SIR=m
+# CONFIG_IRTTY_SIR is not set
 
 #
 # Dongle support
 #
-# CONFIG_DONGLE is not set
 
 #
 # Old SIR device drivers
 #
-CONFIG_IRPORT_SIR=m
+# CONFIG_IRPORT_SIR is not set
 
 #
 # Old Serial dongle support
 #
-# CONFIG_DONGLE_OLD is not set
 
 #
 # FIR device drivers
 #
-CONFIG_PXA_FICP=m
-# CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_PXA_FICP=y
+CONFIG_BT=m
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_SCO is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # Device Drivers
@@ -387,7 +441,8 @@ CONFIG_PXA_FICP=m
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -414,10 +469,11 @@ CONFIG_FW_LOADER=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=1
+CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -432,6 +488,12 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -463,11 +525,16 @@ CONFIG_NETDEVICES=y
 #
 # PHY device support
 #
+# CONFIG_PHYLIB is not set
 
 #
 # Ethernet (10 or 100Mbit)
 #
-# CONFIG_NET_ETHERNET is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -490,7 +557,7 @@ CONFIG_NETDEVICES=y
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
 # CONFIG_PPP_ASYNC is not set
@@ -500,6 +567,7 @@ CONFIG_PPP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=y
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -514,17 +582,17 @@ CONFIG_PPP=m
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_TSDEV=y
+CONFIG_INPUT_TSDEV_SCREEN_X=320
+CONFIG_INPUT_TSDEV_SCREEN_Y=480
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -537,8 +605,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_PXA27x=m
-CONFIG_KEYBOARD_PALMIR=m
+# CONFIG_GPIO_KEYS is not set
+CONFIG_KEYBOARD_PXA27x=y
+# CONFIG_KEYBOARD_PALMWK is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -547,20 +616,25 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
-CONFIG_TOUCHSCREEN_WM97XX=m
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
+# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_WM97XX=y
 # CONFIG_TOUCHSCREEN_WM9705 is not set
 CONFIG_TOUCHSCREEN_WM9712=y
 # CONFIG_TOUCHSCREEN_WM9713 is not set
-CONFIG_TOUCHSCREEN_WM97XX_PXA=y
-CONFIG_TOUCHSCREEN_WM97XX_ACC=y
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_UINPUT is not set
+# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
+# CONFIG_INPUT_MISC is not set
 
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 
@@ -570,6 +644,7 @@ CONFIG_SERIO_SERPORT=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -583,6 +658,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_PXA_COUNT=4
+# CONFIG_SERIAL_PXA_IR is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
@@ -590,57 +666,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 
 #
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-
-#
-# I2C Algorithms
-#
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-CONFIG_I2C_ALGOPXA=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ELV is not set
-CONFIG_I2C_PXA=y
-CONFIG_I2C_PXA_SLAVE=y
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_I2C_ADCM2650 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCA9535 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-
-#
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
@@ -649,21 +674,22 @@ CONFIG_I2C_PXA_SLAVE=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
-CONFIG_NVRAM=m
+CONFIG_HW_RANDOM=m
+# CONFIG_NVRAM is not set
 CONFIG_SA1100_RTC=m
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
 # CONFIG_RAW_DRIVER is not set
 
 #
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
 
 #
 # SPI support
@@ -689,42 +715,19 @@ CONFIG_SPI_PXA2XX=y
 #
 # Hardware Monitoring support
 #
-CONFIG_HWMON=m
+# CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring - Battery
+#
+CONFIG_BATTERY_MONITOR=y
+# CONFIG_ADC_BATTERY is not set
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
 
 #
 # SoC drivers
@@ -733,23 +736,31 @@ CONFIG_HWMON=m
 # CONFIG_SOC_T7L66XB is not set
 # CONFIG_SOC_TC6387XB is not set
 # CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
 # CONFIG_HTC_ASIC2 is not set
 # CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_TSC2200 is not set
 
 #
 # Misc devices
 #
-CONFIG_BATTERY_MONITOR=m
+# CONFIG_BATTCHARGE_MONITOR is not set
 
 #
 # Multimedia Capabilities Port drivers
 #
 # CONFIG_MCP is not set
+# CONFIG_ADC_ADS7846_SSP is not set
+# CONFIG_ADC_AD7877 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
 #
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
@@ -758,14 +769,39 @@ CONFIG_BATTERY_MONITOR=m
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+CONFIG_LEDS_TRIGGER_MMC_CARD=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_SHARED is not set
 
 #
 # Multimedia devices
 #
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 
 #
+# Video Capture Adapters
+#
+
+#
+# Video Capture Adapters
+#
+CONFIG_VIDEO_ADV_DEBUG=y
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_PXA_CAMERA is not set
+
+#
+# Radio Adapters
+#
+
+#
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
@@ -773,19 +809,22 @@ CONFIG_VIDEO_V4L2=y
 #
 # Graphics support
 #
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
-CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
-# CONFIG_FB_PXA_PARAMETERS is not set
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VSFB is not set
 
 #
 # Console display driver support
@@ -794,43 +833,48 @@ CONFIG_FB_PXA=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
+CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 
 #
 # Logo configuration
 #
 CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
+# CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=m
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
+CONFIG_BACKLIGHT_PXAPWM=y
 
 #
 # Sound
 #
-CONFIG_SOUND=m
+CONFIG_SOUND=y
 
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -840,10 +884,8 @@ CONFIG_SND_SEQUENCER_OSS=y
 #
 # Generic devices
 #
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_BUS=m
+CONFIG_SND_AC97_CODEC=y
 # CONFIG_SND_DUMMY is not set
-# CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
@@ -851,22 +893,25 @@ CONFIG_SND_AC97_BUS=m
 #
 # ALSA ARM devices
 #
-# CONFIG_SND_A716 is not set
-# CONFIG_SND_H1910 is not set
-# CONFIG_SND_H2200 is not set
-# CONFIG_SND_H4000 is not set
-# CONFIG_SND_HTCMAGICIAN is not set
-# CONFIG_SND_HX4700 is not set
-# CONFIG_SND_HTCUNIVERSAL is not set
-# CONFIG_SND_H5XXX_AK4535 is not set
-CONFIG_SND_PXA2xx_I2SOUND=m
-CONFIG_SND_PXA2XX_PCM=m
-CONFIG_SND_PXA2XX_AC97=m
+# CONFIG_SND_PXA2xx_I2SOUND is not set
+CONFIG_SND_PXA2XX_PCM=y
+CONFIG_SND_PXA2XX_AC97=y
+
+#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
 
 #
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+
+#
+# HID Devices
+#
+CONFIG_HID=y
 
 #
 # USB support
@@ -883,17 +928,18 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # USB Gadget Support
 #
-CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 CONFIG_USB_GADGET_PXA27X=y
-CONFIG_USB_PXA27X=m
+CONFIG_USB_PXA27X=y
 # CONFIG_USB_PXA27X_DMA is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_MQ11XX is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -901,11 +947,11 @@ CONFIG_USB_PXA27X=m
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_RNDIS is not set
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_G_CHAR=m
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_CHAR is not set
 
 #
 # MMC/SD Card support
@@ -914,16 +960,16 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y
+# CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
-# CONFIG_MMC_ASIC3 is not set
-# CONFIG_MMC_WBSD_PALMT3 is not set
 
 #
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=m
+CONFIG_RTC_EPOCH=1970
 
 #
 # RTC interfaces
@@ -931,17 +977,19 @@ CONFIG_RTC_CLASS=m
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 #
 # RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_SA1100=m
 # CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # File systems
@@ -950,18 +998,20 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=m
+# CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
+# CONFIG_INOTIFY is not set
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
 
 #
@@ -984,8 +1034,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -994,23 +1046,24 @@ CONFIG_RAMFS=y
 # Miscellaneous filesystems
 #
 # CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
+# CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_VMALLOC=y
+# CONFIG_SQUASHFS_VMALLOC is not set
+# CONFIG_SQUASHFS_LZMA is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-CONFIG_UNION_FS=m
+# CONFIG_UNION_FS is not set
 
 #
 # Network File Systems
@@ -1025,8 +1078,7 @@ CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -1057,7 +1109,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_863 is not set
 # CONFIG_NLS_CODEPAGE_864 is not set
 # CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
+CONFIG_NLS_CODEPAGE_866=y
 # CONFIG_NLS_CODEPAGE_869 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
 # CONFIG_NLS_CODEPAGE_950 is not set
@@ -1069,7 +1121,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
+CONFIG_NLS_ISO8859_2=y
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
 # CONFIG_NLS_ISO8859_5 is not set
@@ -1079,11 +1131,16 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
+CONFIG_NLS_KOI8_R=y
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -1092,14 +1149,16 @@ CONFIG_NLS_UTF8=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_SMALLOOPS is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_DEBUG_USER is not set
 
 #
@@ -1111,7 +1170,39 @@ CONFIG_FRAME_POINTER=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
@@ -1120,8 +1211,11 @@ CONFIG_FRAME_POINTER=y
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
-CONFIG_CRC16=m
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
index 3eee7171c0..552356e23a 100644
--- a/packages/linux/linux-hackndev-2.6_svn.bb
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)"
 
diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb
index 5022afa41a..d166e78a3a 100644
--- a/packages/matchbox2/matchbox-panel-2_svn.bb
+++ b/packages/matchbox2/matchbox-panel-2_svn.bb
@@ -3,11 +3,10 @@ LICENSE = "GPL"
 SECTION = "x11/panels"
 DEPENDS = "gtk+"
 
-RREPLACES_${PN} = "matchbox-panel"
 RCONFLICTS_${PN} = "matchbox-panel"
 
 PV = "0.1+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
new file mode 100644
index 0000000000..cf399644e3
--- /dev/null
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -0,0 +1,94 @@
+DESCRIPTION = "Meta package for a Scratchbox SDK"
+LICENSE = "MIT"
+PR = "r1"
+
+PACKAGES = ""
+
+inherit rootfs_ipk sdk debian
+
+SDK_DIR = "${WORKDIR}/sdk"
+SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
+prefix = "/"
+exec_prefix = "${prefix}"
+base_prefix = "${exec_prefix}"
+FILES_${PN} = "${prefix}"
+
+TARGET_INSTALL = "\
+    task-sdk-base \
+    task-sdk-x11 \
+    task-sdk-x11-ext \
+    task-sdk-gpe"
+
+DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+RDEPENDS = "${TARGET_INSTALL}"
+BUILD_ALL_DEPS = "1"
+
+
+IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
+
+do_populate_sdk() {
+
+        set -ex
+        rootfs_ipk_do_indexes
+        set +ex
+
+	rm -rf ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+        cat <<EOF >${SDK_DIR}/ipkg-target.conf
+src oe file:${DEPLOY_DIR_IPK}
+EOF
+	ipkgarchs="${PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do
+                echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
+	        priority=$(expr $priority + 5)
+		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf
+		fi
+        done
+
+	rm -r ${SDK_OUTPUT}
+	mkdir -p ${SDK_OUTPUT}
+
+	${IPKG_TARGET} update
+	${IPKG_TARGET} install ${TARGET_INSTALL}
+
+	mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include
+	#cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
+	#rm -rf ${SDK_OUTPUT}/${prefix}/usr/
+
+        #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
+        #rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
+
+	cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/
+        cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/
+	chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/
+	find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x
+
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so
+	# remove unwanted housekeeping files
+	mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
+
+	# remove unwanted executables
+	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
+
+	# remove broken .la files
+	#rm ${SDK_OUTPUT}/${prefix}/lib/*.la
+
+	# fix pkgconfig data files
+	cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
+	for f in *.pc ; do
+		sed -i 's%${STAGING_DIR}%/usr/%g' "$f"
+	done
+
+        mkdir -p ${SDK_DEPLOY}
+	cd ${SDK_OUTPUT}
+	fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz .
+}
+
+do_populate_sdk[nostamp] = "1"
+addtask populate_sdk before do_build after do_install
diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb
index 3ac18438b1..b478ca2604 100644
--- a/packages/openmoko-base/openmoko-libs_svn.bb
+++ b/packages/openmoko-base/openmoko-libs_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
 SECTION = "openmoko/libs"
 LICENSE = "LGPL"
-DEPENDS += "gtk+"
+DEPENDS += "gtk+ eds-dbus"
 PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko
 
@@ -17,3 +17,8 @@ do_stage() {
 	autotools_stage_all
 }
 
+PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg"
+
+FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
+FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
+FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*"
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index cc5978f546..af927ddc47 100644
--- a/packages/openmoko-pim/openmoko-dates_svn.bb
+++ b/packages/openmoko-pim/openmoko-dates_svn.bb
@@ -3,10 +3,9 @@ SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
 RDEPENDS = "libedata-cal"
-RCONFLICTS = "dates"
-RREPLACES = "dates"
+RCONFLICTS_${PN} = "dates"
 PV = "0.1+svn${SRCDATE}"
-PR = "r7"
+PR = "r8"
 
 inherit gnome autotools pkgconfig gtk-icon-cache
 
diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index 641ff60aea..4f92b2c767 100644
--- a/packages/pimlico/dates.inc
+++ b/packages/pimlico/dates.inc
@@ -3,8 +3,7 @@ LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 RDEPENDS = "libedata-cal"
-RCONFLICTS = "openmoko-dates"
-RREPLACES = "openmoko-dates"
+RCONFLICTS_${PN} = "openmoko-dates"
 
 inherit autotools pkgconfig gtk-icon-cache
 
diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb
index 731ca31289..176d2b9077 100644
--- a/packages/pimlico/dates_0.3.1.bb
+++ b/packages/pimlico/dates_0.3.1.bb
@@ -1,5 +1,5 @@
 require dates.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index 956eb3dc64..cac0eb4fae 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -1,6 +1,6 @@
 require dates.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc
index e43ddec14b..30b69ad516 100755
--- a/packages/sysvinit/sysvinit/angstrom/rc
+++ b/packages/sysvinit/sysvinit/angstrom/rc
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 #
 # rc		This file is responsible for starting/stopping
 #		services when the runlevel changes.
@@ -21,13 +20,12 @@ export VERBOSE
 
 startup_progress() {
     step=$(($step + $step_change))
-
-    if [ $(($num_steps + $first_step)) -lt 1 ]; then
-        num_steps="1"
-        first_step="0"
+    if [ "$num_steps" != "0" ]; then
+        progress=$((($step * $progress_size / $num_steps) + $first_step))
+    else
+        progress=$progress_size
     fi
-
-    progress=$(($step * $progress_size / $num_steps + $first_step))
+    #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
     if type psplash-write >/dev/null 2>&1; then
         TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
     fi
@@ -93,10 +91,10 @@ startup() {
 
 	case "$runlevel" in
 		0|6)
-			# Count down from 0 to -100 and use the entire bar
-			first_step=0
+			# Count down from -100 to 0 and use the entire bar
+			first_step=-100
 			progress_size=100
-			step_change=-1
+			step_change=1
 			;;
 	        S)
 			# Begin where the initramfs left off and use 2/3
@@ -113,6 +111,17 @@ startup() {
 			;;
 	esac
 
+	num_steps=0
+	for s in /etc/rc$runlevel.d/[SK]*; do
+            case "${s##/etc/rc$runlevel.d/S??}" in
+                gdm|xdm|kdm|reboot|halt)
+                    break
+                    ;;
+            esac
+            num_steps=$(($num_steps + 1))
+        done
+        step=0
+
 	# First, run the KILL scripts.
 	if [ $previous != N ]
 	then
@@ -126,18 +135,6 @@ startup() {
 		done
 	fi
 
-	num_steps=0
-	for s in /etc/rc$runlevel.d/[SK]*; do
-            case "${s##/etc/rc$runlevel.d/S??}" in
-                gdm|xdm|kdm|reboot|halt)
-                    break
-                    ;;
-            esac
-            num_steps=$(($num_steps + 1))
-        done
-
-        step=0
-
 	# Now run the START scripts for this runlevel.
 	for i in /etc/rc$runlevel.d/S*
 	do
@@ -170,9 +167,10 @@ startup() {
 	done
   fi
 
-if [ "x$runlevel" != "xS" ]; then
-    if type psplash-write >/dev/null 2>&1; then
-        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
-    	umount /mnt/.psplash
-    fi
-fi
+#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
+#if [ "x$runlevel" != "xS" ]; then
+#    if type psplash-write >/dev/null 2>&1; then
+#        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
+#    	umount /mnt/.psplash
+#    fi
+#fi
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index a4c4ff8381..c8ce5ba191 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r33"
+PR = "r34"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index a9814d51a1..cbd1ab72f1 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -21,73 +21,67 @@ RDEPENDS_task-sdk-base := "\
     glibc-dev \
     libgcc1 \
     alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
+    libaudiofile-dev \
+    libbluetooth-dev \
     dbus-dev \
     expat-dev \
     fontconfig-dev \
     freetype-dev \
-    glib-2.0-dev \
+    libglib-2.0-dev \
     gstreamer-dev \
     libice-dev \
     ipkg-dev \
-    jpeg-dev \
+    libjpeg-dev \
     libapm-dev \
-    libasound \
+    libasound2 \
     libdisplaymigration-dev \
     libetpan-dev \
     libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
+    libglade-2.0-dev \
+    libgnutls-dev \
     libgpg-error-dev \
-    libidl-dev \
+    libidl-2-dev \
     libiw-dev \
-    libmimedir-dev \
+    libmimedir-0.4-dev \
     libpcap-dev \
     libpixman-dev \
     libpng-dev \
     libschedule-dev \
     libsm-dev \
     libsoundgen-dev \
-    libsoup-dev \
+    libsoup-2.2-dev \
     libsvg-dev \
     libtododb-dev \
     libts-dev \
     libxml2-dev \
     ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    sqlite-dev \
+    libopenobex-dev \
+    libpopt-dev \
+    libreadline-dev \
+    libsqlite-dev \
     zlib-dev \
     libxmu-dev"
 
 RDEPENDS_task-sdk-x11 := "\
-    atk-dev \
-    cairo-dev \
+    libatk-1.0-dev \
+    libcairo-dev \
     gconf-dbus-dev \
     gtk+-dev \
     gtk-engines-dev \
     libsvg-cairo-dev \
-    libmatchbox-dev \
+    libmb-dev \
     matchbox-desktop-dev \
     pango-dev \
-    startup-notification-dev"
+    libstartup-notification-1-dev"
 
 RDEPENDS_task-sdk-x11-ext := "\
-    compositeext-dev \
-    damageext-dev \
-    fixesext-dev \
     libxcursor-dev \
     libxdmcp-dev \
-    libxfixes-dev \
     libxft-dev \
     libxrandr-dev \
     libxrender-dev \
     libxsettings-client-dev \
     randrext-dev \
-    recordext-dev \
-    renderext-dev \
     resourceext-dev \
     libx11-dev \
     libxau-dev \
@@ -103,14 +97,15 @@ RDEPENDS_task-sdk-x11-ext := "\
     libxt-dev \
     xtrans-dev \
     libxtst-dev"
-#    libxss-dev \
+
 
 RDEPENDS_task-sdk-gpe := "\
     libcontactsdb-dev \
-    esound-dev \
+    libesd-dev \
     libeventdb-dev \
     libgpepimc-dev \
     libgpevtype-dev \
     libgpelaunch-dev \
     libgpewidget-dev \
     libhandoff-dev"
+
diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
index 4cab60a531..70d0917887 100644
--- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
+++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Composite extension library."
 LICENSE= "BSD-X"
 
-DEPENDS += " compositeproto virtual/libx11 libxfixes"
+DEPENDS += " compositeproto virtual/libx11 libxfixes libxext"
 PROVIDES = "xcomposite"
 
 XORG_PN = "libXcomposite"
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
index aec94a3a6d..11931f83d6 100644
--- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
+++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch
@@ -1,7 +1,7 @@
 Index: xorg-server-1.2.0/mi/miinitext.c
 ===================================================================
---- xorg-server-1.2.0.orig/mi/miinitext.c	2007-03-29 11:32:40.000000000 +0200
-+++ xorg-server-1.2.0/mi/miinitext.c	2007-03-29 11:33:22.000000000 +0200
+--- xorg-server-1.2.0.orig/mi/miinitext.c	2007-01-23 06:39:17.000000000 +0100
++++ xorg-server-1.2.0/mi/miinitext.c	2007-03-30 11:28:44.000000000 +0200
 @@ -372,6 +372,9 @@
  #ifdef DMXEXT
  extern void DMXExtensionInit(INITARGS);
@@ -22,3 +22,30 @@ Index: xorg-server-1.2.0/mi/miinitext.c
  }
  
  void
+Index: xorg-server-1.2.0/include/kdrive-config.h.in
+===================================================================
+--- xorg-server-1.2.0.orig/include/kdrive-config.h.in	2007-03-30 11:31:07.000000000 +0200
++++ xorg-server-1.2.0/include/kdrive-config.h.in	2007-03-30 11:34:09.000000000 +0200
+@@ -22,6 +22,9 @@
+ /* Support tslib touchscreen abstraction library */
+ #undef TSLIB
+ 
++/* Build XCalibrate extension */
++#undef XCALIBRATE
++
+ /* Verbose debugging output hilarity */
+ #undef DEBUG
+ 
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac	2007-03-30 12:47:25.000000000 +0200
++++ xorg-server-1.2.0/configure.ac	2007-03-30 12:39:01.000000000 +0200
+@@ -1540,7 +1540,7 @@
+ 	    ;;
+     esac
+     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+-    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
++    KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS"
+ 
+     # check if we can build Xephyr
+     PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index d4c01f240a..e6cd3b2f30 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xournal/files/no-printing.diff b/packages/xournal/files/no-printing.diff
deleted file mode 100644
index 7a4724e696..0000000000
--- a/packages/xournal/files/no-printing.diff
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
---- xournal-0.2/configure.in	2006-01-29 22:25:10.000000000 +0000
-+++ xournal-0.2.noprint/configure.in	2006-03-17 13:08:01.000000000 +0000
-@@ -10,11 +10,16 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
- 
-+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
-+#AC_SUBST(GNOMEPRINT_CFLAGS)
-+#AC_SUBST(GNOMEPRINT_LIBS)
-+AM_CONDITIONAL(ENABLE_PRINTING, false)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile
-diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
---- xournal-0.2/src/main.c	2006-01-29 22:22:52.000000000 +0000
-+++ xournal-0.2.noprint/src/main.c	2006-03-17 13:14:50.000000000 +0000
-@@ -28,7 +28,9 @@
- 
- void hide_unimplemented(void)
- {
-+#if ENABLE_PRINTING
-   gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
-+#endif
-   gtk_widget_hide(GET_COMPONENT("journalFlatten"));
-   gtk_widget_hide(GET_COMPONENT("papercolorOther"));
-   gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
-diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
---- xournal-0.2/src/Makefile.am	2005-12-14 20:54:42.000000000 +0000
-+++ xournal-0.2.noprint/src/Makefile.am	2006-03-17 13:07:47.000000000 +0000
-@@ -7,12 +7,16 @@
- 
- bin_PROGRAMS = xournal
- 
-+if ENABLE_PRINTING
-+PRINT_SOURCE = 	xo-print.c xo-print.h
-+endif
-+
- xournal_SOURCES = \
- 	main.c xournal.h \
- 	xo-misc.c xo-misc.h \
- 	xo-file.c xo-file.h \
- 	xo-paint.c xo-paint.h \
--	xo-print.c xo-print.h \
-+	$(PRINT_SOURCE) \
- 	xo-support.c xo-support.h \
- 	xo-interface.c xo-interface.h \
- 	xo-callbacks.c xo-callbacks.h 
-diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
---- xournal-0.2/src/xo-callbacks.c	2006-01-29 19:39:22.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.c	2006-03-17 13:12:01.000000000 +0000
-@@ -7,7 +7,9 @@
- #include <gtk/gtk.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <time.h>
-+#if ENABLE_PRINTING
- #include <libgnomeprintui/gnome-print-dialog.h>
-+#endif
- #include <glib/gstdio.h>
- 
- #include "xournal.h"
-@@ -17,7 +19,9 @@
- #include "xo-misc.h"
- #include "xo-file.h"
- #include "xo-paint.h"
-+#if ENABLE_PRINTING
- #include "xo-print.h"
-+#endif
- 
- void
- on_fileNew_activate                    (GtkMenuItem     *menuitem,
-@@ -261,7 +265,7 @@
- 
- }
- 
--
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate                  (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
-@@ -407,7 +411,7 @@
- 
-   g_free(filename);
- }
--
-+#endif
- 
- void
- on_fileQuit_activate                   (GtkMenuItem     *menuitem,
-diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
---- xournal-0.2/src/xo-callbacks.h	2006-01-26 20:47:00.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.h	2006-03-17 13:08:45.000000000 +0000
-@@ -24,6 +24,7 @@
- on_filePrintOptions_activate           (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
- 
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate                  (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
-@@ -32,6 +33,8 @@
- on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
- 
-+#endif
-+
- void
- on_fileQuit_activate                   (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
-diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
---- xournal-0.2/src/xo-interface.c	2006-01-29 18:58:25.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-interface.c	2006-03-17 13:11:31.000000000 +0000
-@@ -41,10 +41,12 @@
-   GtkWidget *fileSave;
-   GtkWidget *fileSaveAs;
-   GtkWidget *separator1;
-+#if ENABLE_PRINTING
-   GtkWidget *filePrintOptions;
-   GtkWidget *image501;
-   GtkWidget *filePrint;
-   GtkWidget *filePrintPDF;
-+#endif
-   GtkWidget *separator2;
-   GtkWidget *fileQuit;
-   GtkWidget *menuEdit;
-@@ -327,6 +329,7 @@
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
-   gtk_widget_set_sensitive (separator1, FALSE);
- 
-+#if ENABLE_PRINTING
-   filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
-   gtk_widget_show (filePrintOptions);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
-@@ -347,6 +350,7 @@
-   gtk_widget_show (separator2);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
-   gtk_widget_set_sensitive (separator2, FALSE);
-+#endif
- 
-   fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
-   gtk_widget_show (fileQuit);
-@@ -1522,6 +1526,7 @@
-   g_signal_connect ((gpointer) fileSaveAs, "activate",
-                     G_CALLBACK (on_fileSaveAs_activate),
-                     NULL);
-+#if ENABLE_PRINTING
-   g_signal_connect ((gpointer) filePrintOptions, "activate",
-                     G_CALLBACK (on_filePrintOptions_activate),
-                     NULL);
-@@ -1531,6 +1536,7 @@
-   g_signal_connect ((gpointer) filePrintPDF, "activate",
-                     G_CALLBACK (on_filePrintPDF_activate),
-                     NULL);
-+#endif
-   g_signal_connect ((gpointer) fileQuit, "activate",
-                     G_CALLBACK (on_fileQuit_activate),
-                     NULL);
-@@ -1941,11 +1947,13 @@
-   GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
-   GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
-   GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-+#if ENABLE_PRINTING
-   GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
-   GLADE_HOOKUP_OBJECT (winMain, image501, "image501");
-   GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
-   GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
-   GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
-+#endif
-   GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
-   GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
-   GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");
diff --git a/packages/xournal/files/xournal.desktop b/packages/xournal/files/xournal.desktop
new file mode 100644
index 0000000000..52dde1e47c
--- /dev/null
+++ b/packages/xournal/files/xournal.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=0.3.3
+Type=Application
+Name=Xournal
+Comment=Notetaking tool
+Exec=/usr/bin/xournal
+Icon=/usr/share/xournal/pixmaps/xournal.png
+Terminal=false
+
diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb
deleted file mode 100644
index 6a4b6839b4..0000000000
--- a/packages/xournal/xournal_0.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-HOMEPAGE = "http://xournal.sf.net/"
-DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas"
-SECTION = "x11"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \
-        file://no-printing.diff;patch=1"
-
-inherit autotools pkgconfig
diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb
deleted file mode 100644
index 077036b686..0000000000
--- a/packages/xournal/xournal_0.3.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-HOMEPAGE = "http://xournal.sf.net/"
-DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas"
-SECTION = "x11"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \
-	"
-
-inherit autotools pkgconfig
diff --git a/packages/xournal/xournal_0.3.3.bb b/packages/xournal/xournal_0.3.3.bb
new file mode 100644
index 0000000000..5a8a1b74b7
--- /dev/null
+++ b/packages/xournal/xournal_0.3.3.bb
@@ -0,0 +1,17 @@
+HOMEPAGE = "http://xournal.sf.net/"
+DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
+DEPENDS = "gtk+ libgnomecanvas libgnomeprintui"
+SECTION = "x11"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \
+           file://xournal.desktop"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+	install -d ${D}${datadir}/applications/
+	install -m 0644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications/
+}
+
author	Paul Sokolovsky <pmiscml@gmail.com>	2007-03-30 15:46:43 +0000
committer	Paul Sokolovsky <pmiscml@gmail.com>	2007-03-30 15:46:43 +0000
commit	f673b8d213609a6b90b2f923b2cc96e6c0c820a2 (patch)
tree	66ed165ef14b03ca15fa7bf488f4e4aa67ede648
parent	a31229ef8c96e6ad6dbe5c7b9c78639354b73ec0 (diff)
parent	c5747068f49e45234934ba5ab067e0a4ee589c2a (diff)