merge of '32f3152ef198ae19e34181438504621d6e5c0270'

     and '7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7'

22 files changed, 54 insertions, 25 deletions

diff --git a/packages/opie-alarm/opie-alarm/dirdefines.patch b/packages/opie-alarm/opie-alarm/dirdefines.patch
new file mode 100644
index 0000000000..ea1e686dce
--- /dev/null
+++ b/packages/opie-alarm/opie-alarm/dirdefines.patch
@@ -0,0 +1,21 @@
+diff --git a/opiealarm.c b/opiealarm.c
+index 422865c..b948ef2 100644
+--- a/opiealarm.c
++++ b/opiealarm.c
+@@ -367,13 +367,13 @@ int resume ( int resuspend )
+ 				
+ 				setenv ( "LOGNAME", "root", 1 );
+ 				setenv ( "HOME", "/root", 1 );
+-				setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+-				setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
++				setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 );
++				setenv ( "QTDIR", OPIE_QTDIR, 1 );
+ 			
+ 				remove_pidfile ( );
+ 			
+ 				// no need for system() since this process is no longer useful anyway				
+-				execv ( "/opt/QtPalmtop/bin/qcop", argv );
++				execv ( OPIE_BINDIR "/qcop", argv );
+ 				
+ 				perror ( "exec for qcop failed" );
+ 				return 5;
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index b5927363d1..2cdb067668 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,7 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r2.1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
-           file://01opiealarm "
+           file://01opiealarm \
+	   file://dirdefines.patch;patch=1 "
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet.inc b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
index 0db87dbb98..bc638658bb 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet.inc
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet.inc
@@ -17,7 +17,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -26,6 +26,6 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index a364980c1a..7bdec3e27e 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc
index 112c11180a..238819c071 100644
--- a/packages/opie-clockapplet/opie-clockapplet.inc
+++ b/packages/opie-clockapplet/opie-clockapplet.inc
@@ -13,13 +13,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
index 304b687109..46a6d8c7e7 100644
--- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb
+++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-handwriting/opie-handwriting.inc b/packages/opie-handwriting/opie-handwriting.inc
index 86b9ab51c6..c4b79cb671 100644
--- a/packages/opie-handwriting/opie-handwriting.inc
+++ b/packages/opie-handwriting/opie-handwriting.inc
@@ -3,7 +3,6 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "qhandwriting"
-PR = "r1"
 
 
 S = "${WORKDIR}/handwriting"
@@ -14,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 else
   exit 0
 fi
@@ -24,7 +23,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqhandwriting.so*
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index a607b32c69..6f33501dc3 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};module=opie/etc/qimpen"
diff --git a/packages/opie-irdaapplet/opie-irdaapplet.inc b/packages/opie-irdaapplet/opie-irdaapplet.inc
index d9f15453a5..ed47c2ca60 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet.inc
+++ b/packages/opie-irdaapplet/opie-irdaapplet.inc
@@ -13,13 +13,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
index 20c228419e..1fd3393fe1 100644
--- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
+++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r2
+PR = r3
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc
index 9676111efa..3754e48896 100644
--- a/packages/opie-multikey/opie-multikey.inc
+++ b/packages/opie-multikey/opie-multikey.inc
@@ -15,7 +15,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()"
+  ${bindir}/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()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 # FILES plugins/inputmethods/libqmultikey.so* share/multikey/*
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index c16c36616b..307f06ae74 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};module=opie/share \
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet.inc b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
index 6e40790f07..0022ba567a 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet.inc
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet.inc
@@ -13,13 +13,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
index 4c26c30395..000f5b5e05 100644
--- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
            ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
index 11b93eed0f..6ed1908029 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
@@ -12,7 +12,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
 do_install() {
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
index ec2bc0230e..eb0976f8d0 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
 	   ${HANDHELDS_CVS};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard.inc b/packages/opie-pickboard/opie-pickboard.inc
index 37866ceef1..2b81a50104 100644
--- a/packages/opie-pickboard/opie-pickboard.inc
+++ b/packages/opie-pickboard/opie-pickboard.inc
@@ -12,7 +12,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 else
   exit 0
 fi
@@ -21,7 +21,7 @@ fi
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
 
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index 4f778f135d..368f265e95 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,5 +1,6 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
index a8872609f5..b8c94067fd 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
@@ -14,14 +14,14 @@ 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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 if [ -n "$D" ]; then false; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
 }
 
 # FILES plugins/applets/libscreenshotapplet.so*
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 227fed2d0c..43ce79d570 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};module=opie/apps                          \
diff --git a/packages/opie-volumeapplet/opie-volumeapplet.inc b/packages/opie-volumeapplet/opie-volumeapplet.inc
index 6509fde926..3bb619f3bd 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet.inc
+++ b/packages/opie-volumeapplet/opie-volumeapplet.inc
@@ -13,13 +13,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()"
+  ${bindir}/qcop QPE/TaskBar "reloadApplets()"
 fi
 }
 
 pkg_postrm() {
 #!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
  if [ -n "$D" ]; then false; fi
 }
 
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
index 806f7b77fc..86a47417ed 100644
--- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
+++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \
            ${HANDHELDS_CVS};module=opie/apps"