From aeb5e8d2e0ca39cd27c88265fbb5edea501d1ec9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 13 Sep 2005 14:13:52 +0000
Subject: OPIE applets: fix postinst() to not be used during image create -
 usage of "pidof -s qpe" is useless on build machine and make dead processes
 here - close bug #309 - creation of postinst()/postrm() should be moved to
 opie.bbclass

---
 packages/opie-screenshotapplet/opie-screenshotapplet.inc      | 4 ++--
 packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb | 4 ++--
 packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'packages/opie-screenshotapplet')

diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet.inc b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
index 951e81b709..1ff889ab20 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet.inc
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet.inc
@@ -13,16 +13,16 @@ 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 "reloadApplets()"
 fi
- if [ -n "$D" ]; then false; fi
 }
 
 pkg_postrm() {
 #!/bin/sh
+if [ -n "$D" ]; then false; fi
 /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
- if [ -n "$D" ]; then false; fi
 }
 
 # FILES plugins/applets/libscreenshotapplet.so*
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
index da266ce171..ccc414ef94 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps                          \
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
index 136739d68c..54f64162ab 100644
--- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \
            ${HANDHELDS_CVS};module=opie/apps                          \
-- 
cgit 1.2.3-korg