Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/06/03 19:25:28+02:00 hrw.one.pl!hrw
remove postinst/postrm errors

BKrev: 40bf5f67OtvAg844gK-VdDDx38NM-w

11 files changed, 60 insertions, 20 deletions

diff --git a/opie-cardmon/opie-cardmon_cvs.oe b/opie-cardmon/opie-cardmon_cvs.oe
index 8a76e4ee82..bec3300417 100644
--- a/opie-cardmon/opie-cardmon_cvs.oe
+++ b/opie-cardmon/opie-cardmon_cvs.oe
@@ -20,13 +20,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav
diff --git a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
index 8a340491c4..b189995431 100644
--- a/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
+++ b/opie-clipboardapplet/opie-clipboardapplet_cvs.oe
@@ -19,13 +19,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libclipboardapplet.so*
diff --git a/opie-clockapplet/opie-clockapplet_cvs.oe b/opie-clockapplet/opie-clockapplet_cvs.oe
index c40b3b1321..699e06dc7a 100644
--- a/opie-clockapplet/opie-clockapplet_cvs.oe
+++ b/opie-clockapplet/opie-clockapplet_cvs.oe
@@ -19,13 +19,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libclockapplet.so*
diff --git a/opie-handwriting/opie-handwriting_cvs.oe b/opie-handwriting/opie-handwriting_cvs.oe
index 8660693e38..c33fc2e399 100644
--- a/opie-handwriting/opie-handwriting_cvs.oe
+++ b/opie-handwriting/opie-handwriting_cvs.oe
@@ -16,7 +16,7 @@ inherit opie
 
 pkg_postinst() {
 #!/bin/sh
-if [ -n $D ]; then exit 1; fi
+if [ -n "$D" ]; then exit 1; fi
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
 else
@@ -27,7 +27,7 @@ fi
 
 pkg_postrm() {
 #!/bin/sh
-if [ -n $D ]; then exit 1; fi
+if [ -n "$D" ]; then exit 1; fi
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
 }
 
diff --git a/opie-irdaapplet/opie-irdaapplet_cvs.oe b/opie-irdaapplet/opie-irdaapplet_cvs.oe
index b1efff0e3a..2db463fb84 100644
--- a/opie-irdaapplet/opie-irdaapplet_cvs.oe
+++ b/opie-irdaapplet/opie-irdaapplet_cvs.oe
@@ -20,13 +20,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
diff --git a/opie-multikey/opie-multikey_cvs.oe b/opie-multikey/opie-multikey_cvs.oe
index e69de29bb2..5040eb0f2f 100644
--- a/opie-multikey/opie-multikey_cvs.oe
+++ b/opie-multikey/opie-multikey_cvs.oe
@@ -0,0 +1,40 @@
+DESCRIPTION = "Multiple language keyboard"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Open Embedded <oe@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2 opie-pickboard"
+RDEPENDS = "opie-pics"
+PV = "1.1.4-cvs-${CVSDATE}"
+APPNAME = "qmultikey"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/inputmethods/multikey;date=${CVSDATE} \
+	cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share;date=${CVSDATE}"
+
+S = "${WORKDIR}/multikey"
+
+inherit opie
+
+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()"
+else
+  exit 0
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+}
+
+# FILES plugins/inputmethods/libqmultikey.so* share/multikey/*
+do_install() {
+	install -d ${D}${palmtopdir}/share/multikey/
+	install -m 0644 ${WORKDIR}/share/multikey/*.keymap ${D}${palmtopdir}/share/multikey/
+	install -m 0644 ${WORKDIR}/share/multikey/README ${D}${palmtopdir}/share/multikey/
+}
+
diff --git a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
index 09ec2fb28e..d5c25b6bcd 100644
--- a/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
+++ b/opie-multikeyapplet/opie-multikeyapplet_cvs.oe
@@ -18,13 +18,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libmultikeyapplet.so*
diff --git a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
index bbe3b85c58..18c525adc9 100644
--- a/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
+++ b/opie-screenshotapplet/opie-screenshotapplet_cvs.oe
@@ -18,13 +18,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libscreenshotapplet.so*
diff --git a/opie-volumeapplet/opie-volumeapplet_cvs.oe b/opie-volumeapplet/opie-volumeapplet_cvs.oe
index 264636d953..80e96b4a21 100644
--- a/opie-volumeapplet/opie-volumeapplet_cvs.oe
+++ b/opie-volumeapplet/opie-volumeapplet_cvs.oe
@@ -18,13 +18,13 @@ pkg_postinst() {
 if pidof -s qpe >/dev/null; then
   /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
 fi
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n $D ]; then false; fi
+ if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libvolumeapplet.so*
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index eb7bfd9b48..bc3fc4fbf5 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -97,10 +97,10 @@ do_install() {
 
 pkg_postinst () {
 #!/bin/sh
-if [ -n $D ]; then exit 1; fi
+if [ -n "$D" ]; then exit 1; fi
 set -e
 . /etc/profile
-update-qtfontdir
+${sbindir}/update-qtfontdir
 }
 
 #
diff --git a/vera-fonts/qpf-bitstream-vera_1.10.oe b/vera-fonts/qpf-bitstream-vera_1.10.oe
index a83ab33063..a79b3f499b 100644
--- a/vera-fonts/qpf-bitstream-vera_1.10.oe
+++ b/vera-fonts/qpf-bitstream-vera_1.10.oe
@@ -14,10 +14,10 @@ do_install () {
 
 pkg_postinst () {
 #!/bin/sh
-if [ -n $D ]; then exit 1; fi
+if [ -n "$D" ]; then exit 1; fi
 set -e
 . /etc/profile
-update-qtfontdir
+${sbindir}/update-qtfontdir
 }
 
 PACKAGES = "qpf-bitstream-vera-small qpf-bitstream-vera-large"