From: Matthias Hentges <oe@hentges.net>
Date: Thu, 2 Dec 2004 10:49:27 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~15815
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181178209db3fb8f08a336fd554816e4efa0f649;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/packages
into handhelds.org:/home/mhentges/OpenEmbedded/packages-devel

2004/12/02 11:49:06+01:00 handhelds.org!CoreDump
Fix missing QTDIR and add /o/Q/bin to PATH

BKrev: 41aef337K2AIGZp2CfgfZTN42vydaQ
---

diff --git a/opie-taskbar/opie-taskbar/opie_defaults b/opie-taskbar/opie-taskbar/opie_defaults
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
index e3e4cc1a82..460bbd725e 100644
--- a/opie-taskbar/opie-taskbar_1.1.7.oe
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
@@ -20,7 +20,8 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            file://server.pro-1.1.7 \
            file://opie-reorgfiles \
            file://opie \
-           file://qpe.conf"
+           file://qpe.conf \
+	   file://opie_defaults"
 
 S = "${WORKDIR}/launcher"
 
@@ -75,6 +76,7 @@ do_install() {
 	install -d ${D}/${palmtopdir}/pics/logo
 	install -d ${D}/${palmtopdir}/pics/RoH/star/
 	install -d ${D}/etc/init.d
+	install -d ${D}/etc/profile.d
 	install -d ${D}/${palmtopdir}/etc/colors
 	install -d ${D}/${palmtopdir}/etc/skel
 
@@ -82,6 +84,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
 	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
 
 	for p in ${PICS}
 	do
@@ -126,7 +129,7 @@ do_install_append_tosa () {
 	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
 }
 
-FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
+FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index a766e11b3e..1c89d32427 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -70,6 +70,7 @@ do_install() {
 	install -d ${D}/${palmtopdir}/pics/logo
 	install -d ${D}/${palmtopdir}/pics/RoH/star/
 	install -d ${D}/etc/init.d
+	install -d ${D}/etc/profile.d	
 	install -d ${D}/${palmtopdir}/etc/colors
 	install -d ${D}/${palmtopdir}/etc/skel
 
@@ -77,6 +78,7 @@ do_install() {
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
 	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
 
 	for p in ${PICS}
 	do