summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Schurig <schurig@mn-solutions.de>2004-09-20 10:55:30 +0000
committerHolger Schurig <schurig@mn-solutions.de>2004-09-20 10:55:30 +0000
commit85bd45049346af1f5f2879ef8ff0aa909f7739f2 (patch)
treef8b467abd52b4e6db3f2b2cb63e84ee4aeb2570b
parentd1b28b5f11893edfdfd0d244d0ee2df91e4d29f0 (diff)
Merge http://openembedded@openembedded.bkbits.net/packages
into mnz66.mn-logistik.de:/usr/src/ramses/oe/packages 2004/09/20 12:54:46+02:00 mn-logistik.de!schurig fix from CoreDump BKrev: 414eb7227IoSYToojpRKRmIc0a9Zpw
-rw-r--r--opie-zkbapplet/opie-zkbapplet_1.1.6.oe6
-rw-r--r--opie-zkbapplet/opie-zkbapplet_cvs.oe2
2 files changed, 1 insertions, 7 deletions
diff --git a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe b/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
index f13320c685..8f510efa10 100644
--- a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
+++ b/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
@@ -18,12 +18,6 @@ S = "${WORKDIR}/${APPNAME}"
inherit opie
-pkg_postinst() {
-#!/bin/sh
-if [ -n "$D" ]; then exit 1; fi
-test -f $OPIEDIR/share/zkb/zkb.xml || cp $OPIEDIR/share/zkb/zkb.xml.sample $OPIEDIR/share/zkb/zkb.xml
-}
-
do_install() {
install -d ${D}${palmtopdir}/pics/
install -d ${D}${palmtopdir}/share/zkb/
diff --git a/opie-zkbapplet/opie-zkbapplet_cvs.oe b/opie-zkbapplet/opie-zkbapplet_cvs.oe
index a6efd8ea12..57eb28007c 100644
--- a/opie-zkbapplet/opie-zkbapplet_cvs.oe
+++ b/opie-zkbapplet/opie-zkbapplet_cvs.oe
@@ -27,9 +27,9 @@ do_install() {
install -d ${D}${palmtopdir}/pics/
install -d ${D}${palmtopdir}/share/zkb/
install -m 0644 ${WORKDIR}/share/zkb/*xml* ${D}${palmtopdir}/share/zkb/
+ install -m 0644 ${WORKDIR}/share/zkb/zkb.xml.sample ${D}${palmtopdir}/share/zkb/zkb.xml
install -d ${D}${palmtopdir}/bin
install -m 0755 ${S}/keyz-cfg ${D}${palmtopdir}/bin/
install -d ${D}${palmtopdir}/apps/Settings
install -m 0644 ${WORKDIR}/apps/Settings/keyz-cfg.desktop ${D}${palmtopdir}/apps/Settings/
}
-