merge of '932bb6fa0e80d486c10b983e9557b9f2cc12f81d'

     and 'adc9d2b07147baa9165b930a857e39f5f57331a3'

9 files changed, 15 insertions, 172 deletions

diff --git a/packages/libopietooth/libopietooth1.inc b/packages/libopietooth/libopietooth1.inc
index 4b81f26cab..2ceae495c3 100644
--- a/packages/libopietooth/libopietooth1.inc
+++ b/packages/libopietooth/libopietooth1.inc
@@ -16,6 +16,6 @@ do_stage() {
 }
 
 do_install() {
-    oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
+    oe_libinstall -so libopietooth1 ${D}${libdir}
 }
 
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index db2d069a96..d58832315e 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,4 +1,5 @@
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 require libopietooth1.inc
diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc
index ce128b3b12..138d07cb17 100644
--- a/packages/opie-init/opie-init.inc
+++ b/packages/opie-init/opie-init.inc
@@ -15,15 +15,15 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -d ${D}${sysconfdir}/profile.d	
-	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${bindir}
 	install -d ${D}${palmtopdir}/etc/skel
 
 	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 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/opie_defaults
 
-	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${bindir}/
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
 
 	if [ -s ${WORKDIR}/locale.conf ]; then
@@ -40,6 +40,6 @@ do_install() {
         esac	
 }
 
-FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
+#FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-init/opie-init/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie
deleted file mode 100755
index 84f3b3e673..0000000000
--- a/packages/opie-init/opie-init/c7x0/opie
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-# we need to tinker directly with qws_display until the ODevice
-# default (which is now W100:Rot0:0) works flawlessly with rotation
-# and survives a suspend/resume cycle
-export QWS_DISPLAY=Transformed:Rot0:0
-# export QWS_DISPLAY=W100:Rot0:0
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
-    echo Opie not installed
-    exit 0 
-fi
-
-. /etc/profile
-
-for conf in $OPIEDIR/etc/skel/*.conf; do
-	conf_basename=`basename $conf`
-	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
-		echo "Copying default $conf_basename into $HOME/Settings/"
-		mkdir -p $HOME/Settings/
-		cat $conf >$HOME/Settings/$conf_basename
-	fi
-done
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
-    mkdir -p $HOME/systeminfo/
-    echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
-    #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-    
-    if [ -x "$OPIEDIR/bin/opie-login" ]; then
-            echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
-    else
-        $OPIEDIR/bin/opie-reorgfiles
-        if [ -x /usr/bin/ssh-agent ]; then
-             SSHAGENT=/usr/bin/ssh-agent
-        else
-             SSHAGENT=""
-        fi
-        
-        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
-            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
-        fi           
-        echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
-    fi
-
-    ;;
-
-'stop')
-    echo "Stopping Opie..."
-    killall qpe 2>/dev/null
-    killall opie-login 2>/dev/null
-    killall quicklauncher 2>/dev/null
-
-    ;;
-
-'restart')
-	$0 stop && $0 start
-
-	;;
-
-*)
-    echo "usage: $0 { start | stop | restart }"
-
-    ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/mnci/opie b/packages/opie-init/opie-init/mnci/opie
deleted file mode 100755
index d5e2955b10..0000000000
--- a/packages/opie-init/opie-init/mnci/opie
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-[ -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 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
-    echo Opie not installed
-    exit 0 
-fi
-
-. /etc/profile
-
-if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
-    mkdir -p $HOME/Settings
-    cp $OPIEDIR/etc/skel/* $HOME/Settings
-fi
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
-    mkdir -p $HOME/systeminfo/
-    echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
-    if [ -x "$OPIEDIR/bin/opie-login" ]; then
-            echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
-    else
-        $OPIEDIR/bin/opie-reorgfiles >/dev/null
-        if [ -x /usr/bin/ssh-agent ]; then
-             SSHAGENT=/usr/bin/ssh-agent
-        else
-             SSHAGENT=""
-        fi
-        
-        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
-            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
-        fi           
-        echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null
-    fi
-
-    ;;
-
-'stop')
-    echo "Stopping Opie..."
-        killall qpe 2>/dev/null
-        killall opie-login 2>/dev/null
-        killall quicklauncher 2>/dev/null
-	sleep 1
-        killall -9 qpe 2>/dev/null
-        killall -9 opie-login 2>/dev/null
-        killall -9 quicklauncher 2>/dev/null
-
-    ;;
-
-'restart')
-	$0 stop && $0 start
-
-	;;
-
-*)
-    echo "usage: $0 { start | stop | restart }"
-
-    ;;
-
-esac
-
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie
index 4a90854507..56c54e0a43 100755
--- a/packages/opie-init/opie-init/opie
+++ b/packages/opie-init/opie-init/opie
@@ -8,6 +8,12 @@ export OPIEDIR="$QTDIR"
 export QPEDIR="$QTDIR"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
 export PATH=$PATH:$OPIEDIR/bin
+# Following is from c7x0 override, check for validity, etc.
+## we need to tinker directly with qws_display until the ODevice 
+## default (which is now W100:Rot0:0) works flawlessly with rotation 
+## and survives a suspend/resume cycle 
+#export QWS_DISPLAY=Transformed:Rot0:0
+## export QWS_DISPLAY=W100:Rot0:0 
 
 if [ -z `which qpe` ] ; then 
     echo Opie not installed
diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb
index 9a56f87179..9d84d6188b 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 = "r6"
+PR = "r7"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \
diff --git a/packages/opie-networksettings/opie-networksettings.inc b/packages/opie-networksettings/opie-networksettings.inc
index 6eeb217309..82c99b29cf 100644
--- a/packages/opie-networksettings/opie-networksettings.inc
+++ b/packages/opie-networksettings/opie-networksettings.inc
@@ -31,7 +31,7 @@ do_install() {
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
 	install -d ${D}${palmtopdir}/lib/
-	oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
+	oe_libinstall -so libinterfaces ${D}${libdir}
 	install -d ${D}${palmtopdir}/plugins/networksettings/
 	for plugin in kppp wlan
 	do
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index 9b5ddf5af8..423037e7cf 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};module=opie/pics \