Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/bitkeeper/openembedded

2005/05/13 23:24:15-07:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/13 23:11:16+02:00 handhelds.org!zecke
libsdl-qpe:
	Patch by Gints Polis to fix the rotation for h38xx iPAQ
	models.

2005/05/13 22:38:41+02:00 handhelds.org!zecke
Qt 2.3.10:
	Patch Qt to support Right To Left scripting of text.
	Patch is courtsey ALynch, the Makefile.in changes are
	done by myself

2005/05/13 12:27:57+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 12:27:36+02:00 hrw.one.pl!hrw
added opie-icon-reload to opie-image - it is small and usefull

2005/05/13 12:13:04+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/13 12:12:52+02:00 uni-frankfurt.de!mickeyl
apply the libqpe fix-titleheight patch for the cvs version as well, since I feel uncomfortable pushing it upstream

2005/05/13 11:36:47+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded

2005/05/13 11:33:38+02:00 hrw.one.pl!hrw
opie-calculator: add files from etc/ to get unit conversations work - patch by Gints Polis

2005/05/13 10:25:00+01:00 rpsys.net!RP
bump

2005/05/13 10:22:43+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/13 10:12:15+01:00 rpsys.net!RP
linux-oz-2.6: Fix suspend/resume issue + add mmc timeout fix

2005/05/13 01:12:31+02:00 uni-frankfurt.de!mickeyl
add pcmciautils 003

2005/05/13 00:45:29+02:00 uni-frankfurt.de!mickeyl
add infrared and ppp modules to c7x0 bootstrap image (kernel 2.6)

2005/05/13 00:23:22+02:00 uni-frankfurt.de!mickeyl
remove meta-grant and gpe-image-grant: please don't commit private .bb files

2005/05/13 00:11:21+02:00 uni-frankfurt.de!mickeyl
spectrum_cs: catch up with linux 2.6.12

2005/05/12 23:54:13+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/12 23:45:30+02:00 uni-frankfurt.de!mickeyl
remove opie-mobilemsg, it has been removed upstream also

2005/05/12 23:09:32+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/12 23:08:58+02:00 utwente.nl!koen
Add kanatest_0.3.6.bb, kanatest.inc, kanatest.desktop, courtesy Robert Marcano

2005/05/12 20:32:38+01:00 nexus.co.uk!pb
new xinerama snapshot


2005/05/12 20:30:35+01:00 nexus.co.uk!pb
use linux-core directory instead of linux

2005/05/12 20:29:34+01:00 nexus.co.uk!pb
update xserver-xorg to 6.8.99.5


2005/05/12 20:27:09+01:00 nexus.co.uk!pb
update mythtv to 0.17


2005/05/12 20:26:18+01:00 nexus.co.uk!pb
correct "--enablee" typo in mythtv_0.16


2005/05/12 20:20:30+01:00 nexus.co.uk!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.nexus.co.uk:/nexus/home/pb/oe/oe

2005/05/09 09:10:48+01:00 nexus.co.uk!pb
add CELF busybox patch for more ash builtins

BKrev: 42859a7e_yqKTfUGEQQRWFA_fBpqQQ

30 files changed, 146 insertions, 178 deletions

diff --git a/packages/busybox/busybox-1.00/celf-ash-builtins.patch b/packages/busybox/busybox-1.00/celf-ash-builtins.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.00/celf-ash-builtins.patch
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 8f55c87ad4..a532168095 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://below.patch;patch=1 \
 	   file://fbset.patch;patch=1 \
 	   file://mount-all-type.patch;patch=1 \
+           file://celf-ash-builtins.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index 602163cb4a..25a5faaa17 100644
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -10,12 +10,12 @@ PV = "0.0cvs${CVSDATE}"
 S = "${WORKDIR}/drm"
 
 do_compile() {
-	oe_runmake -C linux LINUXDIR="${KERNEL_SOURCE}"
+	oe_runmake -C linux-core LINUXDIR="${KERNEL_SOURCE}"
 }
 
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drm
-	cd linux
+	cd linux-core
 	for i in *.ko; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/drm/; done
 }
 
diff --git a/packages/kanatest/files/kanatest.desktop b/packages/kanatest/files/kanatest.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kanatest/files/kanatest.desktop
diff --git a/packages/kanatest/kanatest.inc b/packages/kanatest/kanatest.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kanatest/kanatest.inc
diff --git a/packages/kanatest/kanatest_0.3.6.bb b/packages/kanatest/kanatest_0.3.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kanatest/kanatest_0.3.6.bb
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 34cb89ef1e..01cb70652c 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,8 @@
 include ${PN}.inc
     
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/library"
+SRC_URI = "${HANDHELDS_CVS};module=opie/library \
+           file://fix-titleheight.patch;patch=1"
 
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
index 912301b352..1c4245db76 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
@@ -1,16 +1,15 @@
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/Makefile.am SDL-1.2.7/src/video/qtopia/Makefile.am
---- SDL-1.2.7_old/src/video/qtopia/Makefile.am	2005-03-08 15:13:16.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/Makefile.am	2005-03-08 15:16:17.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/Makefile.am	2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/Makefile.am	2005-05-13 22:36:41.000000000 -0200
 @@ -22,4 +22,4 @@
  # overwrite USER variables
  CXXLD = $(CC)
  CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@
- 		$(TAGS_FILES) $(LISP)
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
---- SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc	2005-03-08 15:13:16.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc	2005-03-08 15:16:17.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc	2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_QWin.cc	2005-05-13 22:36:41.000000000 -0200
 @@ -29,8 +29,11 @@
  #include "SDL_QWin.h"
  #include <qapplication.h>
@@ -73,9 +72,9 @@ diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_QWin.cc SDL-1.2.7/src/video/qtopia
      default:
        scancode = SDLK_UNKNOWN;
        break;
-diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
---- SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc	2005-03-08 15:13:15.000000000 -0200
-+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc	2005-03-08 15:43:30.000000000 -0200
+diff -uNrd tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc
+--- tmp/work/libsdl-qpe-1.2.7-r4_old/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc	2005-05-13 22:34:49.000000000 -0200
++++ tmp/work/libsdl-qpe-1.2.7-r4/SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc	2005-05-13 22:42:03.000000000 -0200
 @@ -45,6 +45,7 @@
  #include <qapplication.h>
  #include <qpe/qpeapplication.h>
@@ -123,13 +122,17 @@ diff -Ndru SDL-1.2.7_old/src/video/qtopia/SDL_sysvideo.cc SDL-1.2.7/src/video/qt
        }
        fclose(fp);
      } else {
-@@ -679,6 +691,11 @@
+@@ -679,6 +691,15 @@
      if (machine == MACHINE_SHARP_SL5500)
        qteRotation = 3;
  
 +    // HP IPaq
-+    if ( ODevice::inst ( )-> series ( ) == Model_iPAQ )
++    if ( ODevice::inst( )-> series ( ) == Model_iPAQ ) {
 +      qteRotation = 3;
++    }
++    if ( ODevice::inst ( )-> model ( ) == Model_iPAQ_H38xx ) {
++      qteRotation = 1;
++    }
 +
 +    
      // SL-B500 用ハック(とりあえず、ね)
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index 334d8250f9..530b032e97 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r18"
+PR = "r19"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -39,10 +39,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/corgi_irda-r2.patch;patch=1 \
            ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/corgi_power-r18.patch;patch=1 \
+           ${RPSRC}/corgi_power-r20.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${RPSRC}/ide_fixes-r1.patch;patch=1 \
            ${RPSRC}/mmc_sd-r4.patch;patch=1 \
+           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
            ${RPSRC}/corgi_snd-r6.patch;patch=1 \
            ${RPSRC}/w100_split-r5-r1.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
index ac8e4d2cc1..4b35a8bccd 100644
--- a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r7"
+PR = "r8"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -35,13 +35,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/ide_drivermodel-r0.patch;patch=1 \	   
-           ${RPSRC}/corgi_power-r18.patch;patch=1 \
+           ${RPSRC}/corgi_power-r20.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
            ${RPSRC}/mmc_sd-r5.patch;patch=1 \
            ${RPSRC}/corgi_snd-r6.patch;patch=1 \
            ${RPSRC}/w100_split-r8.patch;patch=1 \
            ${RPSRC}/pxa_i2c-r1.patch;patch=1 \
            ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
+           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r12.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r0.patch;patch=1 \
diff --git a/packages/meta/grant-image.bb b/packages/meta/grant-image.bb
deleted file mode 100644
index 9ddb6c117f..0000000000
--- a/packages/meta/grant-image.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-MAINTAINER = "Jeremy Grant <jeremy@thegrantclan.org>"
-
-PR = "r1"
-
-export IMAGE_BASENAME = "grant-image"
-
-GRANT_MACHINE_CLASS ?= "none"
-
-XSERVER ?= "xserver-kdrive-fbdev"
-
-DEPENDS = "task-bootstrap \
-	   meta-grant \
-	   ${GRANT_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap \
-	               ${GPE_EXTRA_DEPENDS} \
-		       ${XSERVER} "
-
-ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/meta-grant.bb b/packages/meta/meta-grant.bb
deleted file mode 100644
index 79ab6cfdcb..0000000000
--- a/packages/meta/meta-grant.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-PACKAGES = grant-base-depends grant-task-base grant-task-settings grant-task-apps
-DESCRIPTION = "Meta-package for Grant Palmtop Environment(Based on GPE)"
-MAINTAINER = "Jeremy Grant <jeremy@thegrantclan.org>"
-PR = "r1"
-
-ALLOW_EMPTY = 1
-
-grant-base-depends = "\
-    diet-x11 \
-    virtual/xserver"
-
-RDEPENDS_grant-base-depends := "${grant-base-depends}"
-DEPENDS += " ${grant-base-depends}"
-
-grant-task-base = "\
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    gtk2-theme-angelistic \
-    xst \
-    xprop \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    ttf-bitstream-vera \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    gpe-bootsplash \
-    libgtkstylus \
-    detect-stylus"
-
-RDEPENDS_grant-task-base := "glibc-gconv \
-			   glibc-gconv-iso8859-1 \
-			   gdk-pixbuf-loader-png \
-			   gdk-pixbuf-loader-xpm \
-			   gdk-pixbuf-loader-jpeg \
-			   pango-module-basic-x \
-			   pango-module-basic-fc \
-			   ${gpe-task-base}"
-DEPENDS += " ${grant-task-base}"
-
-grant-task-settings = "\
-    matchbox-panel-manager \
-    gpe-bluetooth \
-    gpe-su \
-    gpe-conf \
-    gpe-clock \
-    gpe-mininet \
-    gpe-mixer \
-    gpe-shield \
-    gpe-wlancfg \
-    gpe-taskmanager \
-    keylaunch \
-    minilite \
-    xmonobut"
-
-RDEPENDS_grant-task-settings := "${grant-task-settings}"
-DEPENDS += " ${grant-task-settings}"
-
-grant-task-apps = "\
-    gpe-calculator \
-    gpe-package \
-    gpe-terminal \
-    gpe-watch \
-    matchbox-panel-hacks \
-    rosetta \
-	 bash \
-	 bitchx \
-	 sudo \
-	 vim"
-
-RDEPENDS_grant-task-apps := "${grant-task-apps}"
-DEPENDS += " ${grant-task-apps}"
-LICENSE = MIT
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 05095abd8f..81402c225f 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -87,7 +87,6 @@ opie-gutenbrowser \
 opie-helpbrowser \
 opie-irc \
 opie-keypebble \
-opie-mobilemsg \
 opie-odict \
 opie-oxygen \
 opie-rdesktop \
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 8d8c7e7130..bb39694983 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -47,7 +47,8 @@ OPIE_BASE_APPS = "opie-packagemanager opie-keytabs opie-console opie-clock \
                   opie-citytime opie-backup"
 
 OPIE_BASE_SETTINGS = "opie-light-and-power opie-appearance opie-systemtime \
-                      opie-sysinfo opie-networksettings opie-button-settings"
+                      opie-sysinfo opie-networksettings opie-button-settings \
+					  opie-icon-reload"
 
 OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
diff --git a/packages/mythtv/mythtv_0.16.bb b/packages/mythtv/mythtv_0.16.bb
index e69de29bb2..0dd6e22120 100644
--- a/packages/mythtv/mythtv_0.16.bb
+++ b/packages/mythtv/mythtv_0.16.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+PR = "r2"
+
+SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
+RDEPENDS = "qt-x11-plugins"
+
+inherit qmake qt3x11
+
+# there is a -march=586 somewhere in the source tree
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+QMAKE_PROFILES = "mythtv.pro"
+
+def mythtv_arch(d):
+        import bb, re
+        arch = bb.data.getVar('TARGET_ARCH', d, 1)
+        if re.match("^i.86$", arch):
+                arch = "x86"
+        elif arch == "x86_64":
+                arch = "x86"
+        elif arch == "arm":
+                arch = "armv4l"
+        return arch
+
+MYTHTV_ARCH := "${@mythtv_arch(d)}"
+
+do_configure_prepend() {
+# it's not autotools anyway, so we call ./configure directly
+	find . -name "Makefile"|xargs rm -f
+	./configure	--prefix=/usr		\
+			--mandir=/usr/man 	\
+			--disable-mp3lame	\
+			--enable-vorbis 	\
+			--disable-faad		\
+			--disable-faadbin 	\
+			--disable-faac		\
+			--disable-mingw32	\
+			--enable-a52		\
+			--disable-a52bin	\
+			--enable-pp		\
+			--enable-shared-pp	\
+			--enable-shared		\
+			--disable-amr_nb	\
+			--disable-amr_nb-fixed	\
+			--disable-sunmlib	\
+						\
+			--cpu=${MYTHTV_ARCH}	\
+			--enable-mmx		\
+			--disable-altivec	\
+			--enable-v4l		\
+			--enable-audio-oss	\
+			--disable-audio-beos	\
+			--enable-dv1394		\
+			--enable-network	\
+			--enable-zlib		\
+			--enable-simple_idct	\
+			--disable-vhook		\
+			--disable-mpegaudio-hp	\
+			--enable-ffserver	\
+			--enable-ffplay		\
+			--enable-risky
+
+	sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new
+	mv settings.pro.new settings.pro
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+
diff --git a/packages/mythtv/mythtv_0.17.bb b/packages/mythtv/mythtv_0.17.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/mythtv_0.17.bb
diff --git a/packages/opie-calculator/opie-calculator.inc b/packages/opie-calculator/opie-calculator.inc
index e69de29bb2..d4c46e9eb4 100644
--- a/packages/opie-calculator/opie-calculator.inc
+++ b/packages/opie-calculator/opie-calculator.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Calculator"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "calculator"
+
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
+do_install() {
+        install -d ${D}${palmtopdir}/pics/calc/
+        install -m 0644 ${WORKDIR}/pics/calc/*.png ${D}${palmtopdir}/pics/calc/
+        install -d ${D}${palmtopdir}/etc/
+        install -m 0644 ${WORKDIR}/etc/unit_conversion.dat ${D}${palmtopdir}/etc/
+}
+
diff --git a/packages/opie-calculator/opie-calculator_1.2.0.bb b/packages/opie-calculator/opie-calculator_1.2.0.bb
index e69de29bb2..49f1944b85 100644
--- a/packages/opie-calculator/opie-calculator_1.2.0.bb
+++ b/packages/opie-calculator/opie-calculator_1.2.0.bb
@@ -0,0 +1,8 @@
+include ${PN}.inc
+
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-calculator/opie-calculator_cvs.bb b/packages/opie-calculator/opie-calculator_cvs.bb
index 999f8ef69e..30b0675b0c 100644
--- a/packages/opie-calculator/opie-calculator_cvs.bb
+++ b/packages/opie-calculator/opie-calculator_cvs.bb
@@ -1,8 +1,9 @@
 include ${PN}.inc
-    
+
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/calculator \
            ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps"
+           ${HANDHELDS_CVS};module=opie/apps \
+           ${HANDHELDS_CVS};module=opie/etc "
diff --git a/packages/opie-mobilemsg/opie-mobilemsg.inc b/packages/opie-mobilemsg/opie-mobilemsg.inc
deleted file mode 100644
index 4dfaae2cbc..0000000000
--- a/packages/opie-mobilemsg/opie-mobilemsg.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Mobile Messaging"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-APPNAME = "mobilemsg"
-APPTYPE = "binary"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
-}
diff --git a/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb b/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb
deleted file mode 100644
index 43e8c67293..0000000000
--- a/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include ${PN}.inc
-    
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/mobilemsg \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb b/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb
deleted file mode 100644
index 5d7133aaf0..0000000000
--- a/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include ${PN}.inc
-    
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/mobilemsg \
-           ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
index d230909506..0ab46eabad 100644
--- a/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
+++ b/packages/orinoco/orinoco-modules-0.13e/add-spectrum-support.patch
@@ -5,7 +5,7 @@
 
 --- /dev/null
 +++ orinoco-0.13e-SN-6/spectrum_cs.c
-@@ -0,0 +1,1220 @@
+@@ -0,0 +1,1209 @@
 +/*
 + * spectrum_cs.c
 + *
@@ -284,8 +284,6 @@
 +#define CS_CHECK(fn, ret) \
 +       do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 +
-+static void spectrum_cs_error(client_handle_t handle, int func, int ret);
-+
 +/*
 + * Reset the card using configuration registers COR and CCSR.
 + * If IDLE is 1, stop the firmware, so that it can be safely rewritten.
@@ -339,7 +337,7 @@
 +	return 0;
 +
 +      cs_failed:
-+	spectrum_cs_error(link->handle, last_fn, last_ret);
++	cs_error(link->handle, last_fn, last_ret);
 +	return -ENODEV;
 +}
 +
@@ -606,15 +604,6 @@
 +/* PCMCIA stuff     						    */
 +/********************************************************************/
 +
-+/* In 2.5 (as of 2.5.69 at least) there is a cs_error exported which
-+ * does this, but it's not in 2.4 so we do our own for now. */
-+static void
-+spectrum_cs_error(client_handle_t handle, int func, int ret)
-+{
-+	error_info_t err = { func, ret };
-+	pcmcia_report_error(handle, &err);
-+}
-+
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +/* Remove zombie instances (card removed, detach pending) */
 +static void
@@ -705,7 +694,7 @@
 +
 +	ret = pcmcia_register_client(&link->handle, &client_reg);
 +	if (ret != CS_SUCCESS) {
-+		spectrum_cs_error(link->handle, RegisterClient, ret);
++		cs_error(link->handle, RegisterClient, ret);
 +		spectrum_cs_detach(link);
 +		return NULL;
 +	}
@@ -1007,7 +996,7 @@
 +	return;
 +
 + cs_failed:
-+	spectrum_cs_error(link->handle, last_fn, last_ret);
++	cs_error(link->handle, last_fn, last_ret);
 +
 + failed:
 +	spectrum_cs_release(link);
@@ -5798,7 +5787,7 @@
 +0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x06,0x00,0x02,0x00,
 +0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x33,0x05,
 +};
---- orinoco-0.13e-SN-6/Makefile~add-spectrum-support
+--- orinoco-0.13e-SN-6/Makefile~add-spectrum-support.patch
 +++ orinoco-0.13e-SN-6/Makefile
 @@ -20,7 +20,7 @@
  endif
diff --git a/packages/orinoco/orinoco-modules_0.13e-26.bb b/packages/orinoco/orinoco-modules_0.13e-26.bb
index 688a5e622c..b2d882253e 100644
--- a/packages/orinoco/orinoco-modules_0.13e-26.bb
+++ b/packages/orinoco/orinoco-modules_0.13e-26.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.tzi.de/~plasmahh/orinoco-0.13e-SN-6.tar.bz2 \
            file://orinoco_cs.conf"
 S = "${WORKDIR}/orinoco-0.13e-SN-6"
 
-PR = "r2"
+PR = "r3"
 
 # use only w/ kernel 2.6
 DEFAULT_PREFERENCE_arm = "-1"
diff --git a/packages/pcmciautils/pcmciautils_003.bb b/packages/pcmciautils/pcmciautils_003.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils_003.bb
diff --git a/packages/qte/qte-2.3.10/bidimetrics.patch b/packages/qte/qte-2.3.10/bidimetrics.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.10/bidimetrics.patch
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 29935f71ec..12a65d94d9 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
    	   file://qpe.patch;patch=1 \
@@ -27,7 +27,8 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
 	   file://qte-fix-iconsize.patch;patch=1 \
 	   file://sharp_char.h \
 	   file://key.patch;patch=1 \
-	   file://switches.h "
+	   file://switches.h \
+           file://bidimetrics.patch;patch=5 "
 
 SRC_URI_append_simpad   	= "file://devfs.patch;patch=1 "
 SRC_URI_append_c7x0		= "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 "
@@ -92,8 +93,8 @@ export SYSCONF_LINK = "${CCLD}"
 export SYSCONF_SHLIB = "${CCLD}"
 export SYSCONF_CFLAGS = "${CFLAGS}"
 export SYSCONF_LINK_SHLIB = "${CCLD}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}"
-#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES}"
+export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
 export SYSCONF_LFLAGS_ramses = "${LDFLAGS}"
 export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xinerama/xinerama_1.0.2+cvs20050505.bb
diff --git a/packages/xserver/xserver-xorg/imake-installed.patch b/packages/xserver/xserver-xorg/imake-installed.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-xorg/imake-installed.patch
diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-xorg_6.8.99.5.bb