From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 4 Jul 2004 20:01:31 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~18328
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d82253fe5f3ff83efda8c187fda2be6c69d3959;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/07/04 22:01:14+02:00 hrw.one.pl!hrw
joined opie-alarm and opie-opiealarm into one opie-alarm package

BKrev: 40e8621blCnfemp0AvL1DfNJMdBpFg
---

diff --git a/opie-opiealarm/opie-opiealarm/01opiealarm b/opie-alarm/opie-alarm/01opiealarm
similarity index 100%
rename from opie-opiealarm/opie-opiealarm/01opiealarm
rename to opie-alarm/opie-alarm/01opiealarm
diff --git a/opie-alarm/opie-alarm_cvs.oe b/opie-alarm/opie-alarm_cvs.oe
index 078c1c8682..2b4473b8f5 100644
--- a/opie-alarm/opie-alarm_cvs.oe
+++ b/opie-alarm/opie-alarm_cvs.oe
@@ -4,15 +4,18 @@ PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 PV = "1.1.4-cvs-${CVSDATE}"
+RDEPENDS = "apmd"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/opiealarm;date=${CVSDATE}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/opiealarm;date=${CVSDATE} \
+           file://01opiealarm "
 S = "${WORKDIR}/opiealarm"
 
 inherit palmtop
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
 }
 
-#FIXME add suspend/resume scripts
+FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/opie-opiealarm/opie-opiealarm_cvs.oe b/opie-opiealarm/opie-opiealarm_cvs.oe
deleted file mode 100644
index e69de29bb2..0000000000