From: Matthias Hentges <oe@hentges.net>
Date: Wed, 29 Mar 2006 03:53:28 +0000 (+0000)
Subject: zaurusd: Include changes from .oz354x
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2325e5291acea9530852ca38486c6e9970796e;p=openembedded.git

zaurusd: Include changes from .oz354x
---

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 \