merge of '005e8450d6bc31cd6fba46f5f0464a08d3eb0a17'

     and 'b4ae3e3209f986e2f04e385ccdf8f1559f0c510b'

20 files changed, 51 insertions, 26 deletions

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 915de890cf..916a8a4a30 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -79,7 +79,7 @@ python opie_do_opie_install() {
 	S = bb.data.getVar( "S", d, 1 )
 	D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
 	WORKDIR = bb.data.getVar( "WORKDIR", d, True )
-	palmtopdir = bb.data.getVar( "palmtopdir", d )
+	palmtopdir = bb.data.getVar( "palmtopdir", d, True )
 	APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
 
 	if desktopdir is not None:
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5df7fd0656..38561149d7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,8 +319,8 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = ""
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
 export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
 export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "/opt/QtPalmtop"
-export palmqtdir = "/opt/QtPalmtop"
+export palmtopdir = "${prefix}"
+export palmqtdir = "${prefix}"
 
 ##################################################################
 # Download locations and utilities.
diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf
index 516d709110..f2e4006a8f 100644
--- a/conf/machine/wl500g.conf
+++ b/conf/machine/wl500g.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the MIPS based WL500g(x) devices
 
 TARGET_ARCH = "mipsel"
+MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
+
 TARGET_CC_ARCH = "-Os -mips2"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 55e7587103..a832ee85f8 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,16 +1,16 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
-           file://include.pro \
-	   file://wireless.patch;patch=1"
+           file://include.pro"
 
 # Patches merged upstream, keep for reference (for 1.2.2)
 #           file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
 #           file://exports.patch;patch=1 \
+#	   file://wireless.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 77ba0f62ec..292a29f7bd 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -74,6 +74,6 @@ do_install() {
 }
 
 FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
-FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*"
+FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so"
 FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
 #PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 0debaa004f..a91ccfcc01 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
diff --git a/packages/opie-console/opie-console.inc b/packages/opie-console/opie-console.inc
index f83ff921f5..67a39d6182 100644
--- a/packages/opie-console/opie-console.inc
+++ b/packages/opie-console/opie-console.inc
@@ -13,6 +13,7 @@ inherit opie
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/console/keys/
+	install -m 0644 ${WORKDIR}/pics/inline/pass.* ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/pics/console/*.png ${D}${palmtopdir}/pics/console/
 	install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}${palmtopdir}/pics/console/keys/
 }
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index ca2955fb0b..4525ff88ae 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc
index d8003925f6..ce128b3b12 100644
--- a/packages/opie-init/opie-init.inc
+++ b/packages/opie-init/opie-init.inc
@@ -18,8 +18,10 @@ do_install() {
 	install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/etc/skel
 
-	install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
+	sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie >${WORKDIR}/opie.tmp
+	sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie_defaults >${WORKDIR}/opie_defaults.tmp
+	install -m 0755 ${WORKDIR}/opie.tmp ${D}${sysconfdir}/init.d/opie
+	install -m 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/
 
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
@@ -38,6 +40,6 @@ do_install() {
         esac	
 }
 
-FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}"
+FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 4a7a9e4330..248ec464da 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -3,9 +3,9 @@
 [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
 [ -z $HOME ] && export HOME=/home/$LOGNAME
 
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
+export QTDIR="@palmtopdir@"
+export OPIEDIR="$QTDIR"
+export QPEDIR="$QTDIR"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
 export PATH=$PATH:$OPIEDIR/bin
 
diff --git a/packages/opie-init/opie-init/opie_defaults b/packages/opie-init/opie-init/opie_defaults
index 7de76e4276..c4d127db33 100644
--- a/packages/opie-init/opie-init/opie_defaults
+++ b/packages/opie-init/opie-init/opie_defaults
@@ -7,7 +7,7 @@ case "$MACHINE" in
 *Poodle)	test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;;
 esac
 
-export QTDIR="/opt/QtPalmtop"
+export QTDIR="@palmtopdir@"
 export OPIEDIR="$QTDIR"
 export QPEDIR="$QTDIR"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib"
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index ca10d61221..419221609a 100644
--- a/packages/opie-init/opie-init_1.2.2.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index c841c50fe6..20c228419e 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r1
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/sounds \
            ${HANDHELDS_CVS};module=opie/apps \
-	   file://learning-cpp.patch;patch=1"
+	  "
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 5207b97c1d..9b5ddf5af8 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps \
 	   ${HANDHELDS_CVS};module=opie/root \
-	   file://wireless.patch;patch=1"
+	  "
diff --git a/packages/opie-oxygen/opie-oxygen.inc b/packages/opie-oxygen/opie-oxygen.inc
index 095f71518b..dbd238f1fa 100644
--- a/packages/opie-oxygen/opie-oxygen.inc
+++ b/packages/opie-oxygen/opie-oxygen.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "Opie Oxygen"
+DESCRIPTION = "Opie Oxygen - Periodic table of elements (Chemistry)"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/opie-qcop/files/.mtn2git_empty b/packages/opie-qcop/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-qcop/files/.mtn2git_empty
diff --git a/packages/opie-qcop/files/unbreak-logging.patch b/packages/opie-qcop/files/unbreak-logging.patch
new file mode 100644
index 0000000000..d2b5228b26
--- /dev/null
+++ b/packages/opie-qcop/files/unbreak-logging.patch
@@ -0,0 +1,16 @@
+Index: opie/core/apps/qcop/qcopimpl.cpp
+===================================================================
+RCS file: /cvs/opie/core/apps/qcop/qcopimpl.cpp,v
+retrieving revision 1.2
+diff -u -r1.2 qcopimpl.cpp
+--- qcop/qcopimpl.cpp	2 Mar 2005 19:23:54 -0000	1.2
++++ qcop/qcopimpl.cpp	3 May 2007 03:09:36 -0000
+@@ -46,7 +46,7 @@
+ 
+ int doqcopimpl (int argc, char *argv[])
+ {
+-    qInstallMsgHandler( disableqdebug );
++    //qInstallMsgHandler( disableqdebug );
+ 
+     if ( argc > 1 ) {
+ 	QString opt = argv[1];
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 13f2a817d0..7a68c6eb20 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,5 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r2"
 
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop \
+           file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index 139c842c90..33307082d0 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Meta-package for Opie TTF support"
 DEPENDS = "freetype"
 SECTION = "opie/fonts"
+PR = "r1"
 
 SRC_URI = "file://update-qtttffontdir.c"
 S = "${WORKDIR}"
@@ -17,6 +18,6 @@ do_install() {
 pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-mkdir -p /opt/QtPalmtop/lib/fonts/
-${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype >/opt/QtPalmtop/lib/fonts/fontdir
+mkdir -p ${palmtopdir}/lib/fonts/
+${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype >${palmtopdir}/lib/fonts/fontdir
 }
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index d9ebc7ccfd..0624c02b53 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,7 +1,7 @@
 require qte-common_${PV}.inc
-PR = "r13"
+PR = "r14"
 
 EXTRA_OECONF += "-thread"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "${palmqtdir}"
+FILES_${PN} = "${palmqtdir}/lib/*.so.*"