merge of '4ac47db7fc2d351953133bf60c4f1af51000942b'

     and 'd81d8ce4431b8e050518b3a6ddf8c6b828365238'

21 files changed, 87 insertions, 23 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index b781af29c8..00bc7b4644 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -75,8 +75,18 @@ do
 		       xserver-kdrive xserver-xorg \
 		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
 		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
-		       task-opie \
-                       task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-connectivity \
+		       task-opie task-opie-games \
+		       opie-bartender opie-calculator opie-checkbook opie-embeddedkonsole opie-keypebble opie-rdesktop opie-sheet opie-wellenreiter opie-write opie-zsafe opie-oxygen opie-eye opie-ftp qpdf2 \
+		       konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \
+		       zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \
+		       atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \
+		       pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \
+		       qmatrix qfish2 froot \
+		       opie-today-weatherplugin \
+		       opie-notesapplet opie-networkapplet opie-lockapplet \
+		       opie-datebook-nationalholidayplugin opie-datebook-chrisholidayplugin \
+		       opie-style-liquid opie-style-metal opie-theme \
+		       opie-dvorak opie-unikeyboard opie-keyview opie-jumpx opie-kjumpx \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
 		       hildon-1 hildon-base-lib hildon-lgpl hildon-libs hildon-thumbnail libconic libgpsbt libgpsmgr libhildonfm libhildonhelp libhildonmime libosso-gsf libosso-help libosso mce-dev osso-gwconnect osso-ic-oss osso-thumbnail outo \
 		       kbdd \
diff --git a/packages/libopie/libopie2/c7x0_w100_disable.patch b/packages/libopie/libopie2/c7x0_w100_disable.patch
new file mode 100644
index 0000000000..959c56c443
--- /dev/null
+++ b/packages/libopie/libopie2/c7x0_w100_disable.patch
@@ -0,0 +1,20 @@
+--- libopie2/opiecore/device/odevice_zaurus.cpp	10 Aug 2008 09:07:32 -0000	1.55
++++ libopie2/opiecore/device/odevice_zaurus.cpp	20 Sep 2008 23:56:20 -0000
+@@ -313,14 +313,14 @@
+     }
+ 
+     // set default qte driver
+-    switch( d->m_model )
++/*    switch( d->m_model )
+     {
+         case Model_Zaurus_SLC7x0:
+             d->m_qteDriver = "W100";
+             break;
+-        default:
++        default:*/
+             d->m_qteDriver = "Transformed";
+-    }
++//    }
+ 
+     m_leds[0] = Led_Off;
+ 
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 66a60aaa7e..50c2971f3b 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,11 +1,12 @@
 require ${PN}.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
 	   file://gcc-syntax-fix.patch;patch=1 \
 	   file://h4000_and_default_rot.patch;patch=1 \
-           file://ipaq_rotate_fix.patch;patch=1"
+           file://ipaq_rotate_fix.patch;patch=1 \
+           file://c7x0_w100_disable.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/opie-jumpx/opie-jumpx.inc b/packages/opie-jumpx/opie-jumpx.inc
index 8448e9a03c..06f810a73c 100644
--- a/packages/opie-jumpx/opie-jumpx.inc
+++ b/packages/opie-jumpx/opie-jumpx.inc
@@ -13,7 +13,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  /usr/bin/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -23,7 +23,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+/usr/bin/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqjumpx.so* pics/jumpx
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.3.bb b/packages/opie-jumpx/opie-jumpx_1.2.3.bb
index b1be4bf1a7..7e1de3b0ac 100644
--- a/packages/opie-jumpx/opie-jumpx_1.2.3.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.2.3.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kjumpx/opie-kjumpx.inc b/packages/opie-kjumpx/opie-kjumpx.inc
index 631f2353b6..95644a5428 100644
--- a/packages/opie-kjumpx/opie-kjumpx.inc
+++ b/packages/opie-kjumpx/opie-kjumpx.inc
@@ -14,7 +14,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+  /usr/bin/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +24,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+/usr/bin/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
index 0a13550770..587fa7924a 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networkapplet/opie-networkapplet.inc b/packages/opie-networkapplet/opie-networkapplet.inc
index f67861e069..dcb5c930f1 100644
--- a/packages/opie-networkapplet/opie-networkapplet.inc
+++ b/packages/opie-networkapplet/opie-networkapplet.inc
@@ -13,7 +13,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -22,7 +22,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
 }
 
 # FILES plugins/applets/libnetworkapplet.so* pics/networkapplet
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
index a965cbd2c0..0ee5f6a00d 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-notesapplet/opie-notesapplet.inc b/packages/opie-notesapplet/opie-notesapplet.inc
index 9c167fd4cd..ca4cae9d65 100644
--- a/packages/opie-notesapplet/opie-notesapplet.inc
+++ b/packages/opie-notesapplet/opie-notesapplet.inc
@@ -13,7 +13,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -22,7 +22,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
 }
 
 # FILES plugins/applets/libnotesapplet.so*
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
index 4bfd335611..95160df5cd 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb
@@ -1,4 +1,5 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
index 706fe4d434..cf83b28711 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc
@@ -11,13 +11,13 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
index 56fe35ce52..8fa1eff6e3 100644
--- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-vmemo/opie-vmemo.inc b/packages/opie-vmemo/opie-vmemo.inc
index d055034190..9b45eff34b 100644
--- a/packages/opie-vmemo/opie-vmemo.inc
+++ b/packages/opie-vmemo/opie-vmemo.inc
@@ -14,14 +14,14 @@ inherit opie
 pkg_postinst() {
 #!/bin/sh
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
  if [ -n "$D" ]; then exit 1; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then exit 1; fi
 }
 
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.3.bb b/packages/opie-vmemo/opie-vmemo_1.2.3.bb
index a7f91b1dee..096a162c0f 100644
--- a/packages/opie-vmemo/opie-vmemo_1.2.3.bb
+++ b/packages/opie-vmemo/opie-vmemo_1.2.3.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet.inc b/packages/opie-wirelessapplet/opie-wirelessapplet.inc
index 037afc7044..d96ed43e87 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet.inc
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet.inc
@@ -14,7 +14,7 @@ pkg_postinst() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -23,5 +23,5 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
 }
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
index 1a1bf963fb..39ed06b51b 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb
@@ -1,4 +1,5 @@
 require ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/qpe-nmap/.mtn2git_empty b/packages/qpe-nmap/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpe-nmap/.mtn2git_empty
diff --git a/packages/qpe-nmap/qpe-nmap_0.02.bb b/packages/qpe-nmap/qpe-nmap_0.02.bb
new file mode 100644
index 0000000000..43cd451957
--- /dev/null
+++ b/packages/qpe-nmap/qpe-nmap_0.02.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A frontend for the nmap port scanner, Qt/Embedded Palmtop Environment"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "nmap"
+PR = "r0"
+
+SRC_URI = "http://www.bluelightning.org/qpe-nmap/files/qpe-nmap-${PV}.tar.bz2"
+
+APPNAME = "qpe-nmap"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+
+S = "${WORKDIR}/qpe-nmap"
+
+inherit opie
+
+do_install () {
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/qpe-nmap/ipk/opt/QtPalmtop/pics/qpe-nmap.png ${D}${palmtopdir}/pics/
+    install -d ${D}${palmtopdir}/apps/Applications/
+    install -m 0644 ${WORKDIR}/qpe-nmap/ipk/opt/QtPalmtop/apps/Applications/qpe-nmap.desktop ${D}${palmtopdir}/apps/Applications/
+}
+
diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb
index 3ef8091435..65b84bcf79 100644
--- a/packages/subapplet/subapplet_1.0.8.bb
+++ b/packages/subapplet/subapplet_1.0.8.bb
@@ -5,7 +5,7 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \
 	file://toolbar-resize-fix.patch;patch=1"
@@ -25,7 +25,7 @@ do_install() {
 pkg_postinst() {
 #!/bin/sh
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -34,6 +34,6 @@ fi
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
index b72ca63358..cf505370e9 100644
--- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb
+++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
@@ -4,6 +4,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz"
 
 S = "${WORKDIR}/TaskList-1.0.5"
@@ -21,7 +23,7 @@ do_install() {
 pkg_postinst() {
 #!/bin/sh
 if pidof -s qpe >/dev/null; then
-  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+  /usr/bin/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -30,6 +32,6 @@ fi
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+/usr/bin/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }