summaryrefslogtreecommitdiff
path: root/packages/opie-taskbar
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-03-15 22:56:30 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-03-15 22:56:30 +0000
commit21757a5bad963331dcc33cc7ff109476269c03e7 (patch)
tree317f27080d4d4886cd397a5fd1d5f9785a70f60d /packages/opie-taskbar
parent8775c527e9c94cfa9c79781eb9112192b6f91fb7 (diff)
parentc83221df5af4799ba3529c470fcda84c76c0b8f7 (diff)
merge of 'a96c9acac99b5599d2b0fb0a518603646414d166'
and 'e8fe2283e0bda61a19e3e7f4cf561a638aa1b1fd'
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r--packages/opie-taskbar/opie-taskbar/opie_defaults5
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.2.bb2
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
3 files changed, 6 insertions, 3 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults
index f560889927..7de76e4276 100644
--- a/packages/opie-taskbar/opie-taskbar/opie_defaults
+++ b/packages/opie-taskbar/opie-taskbar/opie_defaults
@@ -7,6 +7,9 @@ case "$MACHINE" in
*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;;
esac
-export PATH="$PATH:/opt/QtPalmtop/bin"
export QTDIR="/opt/QtPalmtop"
+export OPIEDIR="$QTDIR"
+export QPEDIR="$QTDIR"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib"
+export PATH="$PATH:$OPIEDIR/bin"
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
index a5e154cfef..c6151d2327 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index b2992b0c28..41119484c1 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \