[oe-commits] Andrea Adami : zaurusd: rework patches

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7354ce1960407a294d76edaab5e34a98d888c2b1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7354ce1960407a294d76edaab5e34a98d888c2b1

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Wed Jul  1 00:29:43 2009 +0200

zaurusd: rework patches
 - revert 8c942c2a74598c84dbe9646bbd6bbde6525ca53f
 - minimal fix to 35b530346188557e7b81bcb69ccea27f60766177
 - s/event1/touchscreen0/ is done in a separate patch

---

 recipes/zaurusd/files/avoid-rotated-server.patch   |    7 ++-----
 .../use-ts-symlink-instead-of-hardcoding.diff      |    2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/recipes/zaurusd/files/avoid-rotated-server.patch b/recipes/zaurusd/files/avoid-rotated-server.patch
index 0ee6012..8d72401 100644
--- a/recipes/zaurusd/files/avoid-rotated-server.patch
+++ b/recipes/zaurusd/files/avoid-rotated-server.patch
@@ -16,12 +16,9 @@ Index: zaurusd/config/mach-config/mach-borzoi-vars.in
 ===================================================================
 --- zaurusd.orig/config/mach-config/mach-borzoi-vars.in	2009-03-07 11:04:43.000000000 +0000
 +++ zaurusd/config/mach-config/mach-borzoi-vars.in	2009-06-22 20:51:00.000000000 +0000
-@@ -5,6 +5,9 @@
- SWITCH_EVENT_DEVICE=/dev/input/event0
- 
+@@ -7,4 +7,7 @@
  TSKEYS_CONF=@appconfdir@/tskeys/zaurus-cxx00.conf
--TSKEYS_DEVICE=/dev/input/event1
-+TSKEYS_DEVICE=/dev/input/touchscreen0
+ TSKEYS_DEVICE=/dev/input/event1
  
 -ALSA_MIXER_INIT=@appconfdir@/alsa/cxx00-default.state
 \ No newline at end of file
diff --git a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
index 55118f6..9c418ec 100644
--- a/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
+++ b/recipes/zaurusd/files/use-ts-symlink-instead-of-hardcoding.diff
@@ -15,7 +15,7 @@
  SWITCH_EVENT_DEVICE=/dev/input/event0
  
  TSKEYS_CONF=@appconfdir@/tskeys/zaurus-cxx00.conf
--TSKEYS_DEVICE=/dev/input/touchscreen0
+-TSKEYS_DEVICE=/dev/input/event1
 +TSKEYS_DEVICE=/dev/input/touchscreen0
  
  ALSA_MIXER_INIT=@appconfdir@/alsa/cxx00-default.state