2 files changed, 16 insertions, 3 deletions
diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc
index 8833caaa63..bac34ce714 100644
--- a/packages/opie-sh/opie-sh.inc
+++ b/packages/opie-sh/opie-sh.inc
@@ -3,7 +3,6 @@ SECTION = "opie/Shell"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-RDEPENDS = "opie-sh"
 APPNAME = "opie-sh"
 APPTYPE = "binary"
 
@@ -31,7 +30,21 @@ do_install() {
 PACKAGES = " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
 opie-sh-killproc opie-sh-launcher-refresh opie-sh-logviewer opie-sh-rsynchelper \
 opie-sh-servicemanager opie-sh-ssh-askpass opie-sh-stowawayctrl opie-sh-usbnetctrl \
-opie-sh-wavelanchooser opie-sh"
+opie-sh-wavelanchooser ${PN}"
+
+RDEPENDS_opie-sh-microkbd = "opie-sh"
+RDEPENDS_opie-sh-diskfree = "opie-sh"
+RDEPENDS_opie-sh-fsmounter = "opie-sh"
+RDEPENDS_opie-sh-hostlist = "opie-sh"
+RDEPENDS_opie-sh-killproc = "opie-sh"
+RDEPENDS_opie-sh-launcher-refresh = "opie-sh"
+RDEPENDS_opie-sh-logviewer = "opie-sh"
+RDEPENDS_opie-sh-rsynchelper = "opie-sh"
+RDEPENDS_opie-sh-servicemanager = "opie-sh"
+RDEPENDS_opie-sh-ssh-askpass = "opie-sh"
+RDEPENDS_opie-sh-stowawayctrl = "opie-sh"
+RDEPENDS_opie-sh-usbnetctrl = "opie-sh"
+RDEPENDS_opie-sh-wavelanchooser = "opie-sh"
 
 FILES_opie-sh-microkbd = " ${palmtopdir}/bin/microkbd.sh ${palmtopdir}/apps/Opie-SH/microkbd.desktop ${palmtopdir}/pics/opie-sh-scripts/keyz-cfg.png"
 FILES_opie-sh-diskfree = " ${palmtopdir}/bin/diskfree.sh ${palmtopdir}/apps/Opie-SH/diskfree.desktop ${palmtopdir}/pics/opie-sh-scripts/diskfree.png"
diff --git a/packages/opie-sh/opie-sh_cvs.bb b/packages/opie-sh/opie-sh_cvs.bb
index dad51d3eb5..782f06e4ba 100644
--- a/packages/opie-sh/opie-sh_cvs.bb
+++ b/packages/opie-sh/opie-sh_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 
-PV = "1.2.1+cvs-${CVSDATE}"
+PV = "1.2.1+cvs${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/opie-sh \
            ${HANDHELDS_CVS};module=opie/pics \