[oe-commits] : Fix qcop paths in postinst/postrm for multiple Opie/QPE packages

OE GIT Trial gittrial at amethyst.openembedded.net
Tue Oct 7 08:46:54 UTC 2008 

Module: org.openembedded.dev.git
Branch: org.openembedded.stable
Commit: 96a8bb00db24af98a5622d44d7b2397be19c3fc1
URL:    http://gitweb.openembedded.net/?p=org.openembedded.dev.git&a=commit;h=96a8bb00db24af98a5622d44d7b2397be19c3fc1

Author:  <bluelightning at openembedded.org>
Date:   Sun Oct  5 16:51:06 2008 +0000

Fix qcop paths in postinst/postrm for multiple Opie/QPE packages
Applied to .dev in: 231120beb086196600461c605e8af972d11ff350,
f55b0eb745c295a90ea8e6e188f87c0493386d01

---

 packages/opie-jumpx/opie-jumpx.inc                 |    4 ++--
 packages/opie-jumpx/opie-jumpx_1.2.3.bb            |    1 +
 packages/opie-kjumpx/opie-kjumpx.inc               |    4 ++--
 packages/opie-kjumpx/opie-kjumpx_1.2.3.bb          |    1 +
 packages/opie-networkapplet/opie-networkapplet.inc |    4 ++--
 .../opie-networkapplet/opie-networkapplet_1.2.3.bb |    1 +
 packages/opie-notesapplet/opie-notesapplet.inc     |    4 ++--
 .../opie-notesapplet/opie-notesapplet_1.2.3.bb     |    1 +
 .../opie-pyquicklaunchapplet.inc                   |    4 ++--
 .../opie-pyquicklaunchapplet_1.2.3.bb              |    1 +
 packages/opie-vmemo/opie-vmemo.inc                 |    4 ++--
 packages/opie-vmemo/opie-vmemo_1.2.3.bb            |    1 +
 .../opie-wirelessapplet/opie-wirelessapplet.inc    |    4 ++--
 .../opie-wirelessapplet_1.2.3.bb                   |    1 +
 packages/subapplet/subapplet_1.0.8.bb              |    6 +++---
 packages/tasklistapplet/tasklistapplet_1.0.5.bb    |    6 ++++--
 16 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/opie-jumpx/opie-jumpx.inc b/packages/opie-jumpx/opie-jumpx.inc
index 8448e9a..06f810a 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 b1be4bf..7e1de3b 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 631f235..95644a5 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 0a13550..587fa79 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 f67861e..dcb5c93 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 a965cbd..0ee5f6a 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 9c167fd..ca4cae9 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 4bfd335..95160df 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 706fe4d..cf83b28 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 56fe35c..8fa1eff 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 d055034..9b45eff 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 a7f91b1..096a162 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 037afc7..d96ed43 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 1a1bf96..39ed06b 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/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb
index 3ef8091..65b84bc 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 b72ca63..cf50537 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
 }

More information about the Openembedded-commits mailing list