summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-03-29 03:53:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-29 03:53:28 +0000
commit4c2325e5291acea9530852ca38486c6e9970796e (patch)
tree722e38d8e329e46d51bec36284cff2642fd34ee3
parent178400fc6dff5214080e064bbc59dcd034d18327 (diff)
zaurusd: Include changes from .oz354x
-rw-r--r--packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch4
-rw-r--r--packages/zaurusd/zaurusd_svn.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
index f4ef7c5aee..e2d56874c9 100644
--- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
+++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
@@ -25,8 +25,8 @@
+
+ if ! test -e "/tmp/gpe-panel.session-$panel_user"
+ then
-+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
-+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
++ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
++ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
+ else
+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
+ rm "/tmp/gpe-panel.session-$panel_user"
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 4f20dc23c5..52a7b353d3 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -3,7 +3,7 @@ SECTION = "base"
MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
DESCRIPTION = "Daemon to handle device specifc features."
PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
DEPENDS = "tslib"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \