merge of '4ce409402d3a4d6242c33a93272d0721659ad13f'

     and 'b390e39e15fdf0dd583d371f2d99f56f01cc9794'

10 files changed, 14 insertions, 1 deletions

diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xorg-xserver/files/.mtn2git_empty
+++ b/packages/xserver-common/.mtn2git_empty
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-common/files/.mtn2git_empty
diff --git a/packages/xorg-xserver/files/calibrate_zaurusd.patch b/packages/xserver-common/files/calibrate_zaurusd.patch
index 6a7e3b02b7..6a7e3b02b7 100644
--- a/packages/xorg-xserver/files/calibrate_zaurusd.patch
+++ b/packages/xserver-common/files/calibrate_zaurusd.patch
diff --git a/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch b/packages/xserver-common/files/poodle-xmodmap-2.6.patch
index 73cf3f6ffb..73cf3f6ffb 100644
--- a/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
+++ b/packages/xserver-common/files/poodle-xmodmap-2.6.patch
diff --git a/packages/xorg-xserver/files/setDPI.sh b/packages/xserver-common/files/setDPI.sh
index 04a2edd6c6..04a2edd6c6 100644
--- a/packages/xorg-xserver/files/setDPI.sh
+++ b/packages/xserver-common/files/setDPI.sh
diff --git a/packages/xserver-common/files/w100.patch b/packages/xserver-common/files/w100.patch
new file mode 100644
index 0000000000..ca908850e2
--- /dev/null
+++ b/packages/xserver-common/files/w100.patch
@@ -0,0 +1,12 @@
+--- xserver-common-1.10/X11/Xserver.orig	2006-09-02 13:54:30.000000000 +0200
++++ xserver-common-1.10/X11/Xserver	2006-09-02 14:00:22.000000000 +0200
+@@ -14,6 +14,9 @@
+ if [ -f /usr/bin/Xomap ]; then
+   XSERVER=Xomap
+ fi
++if [ -f /usr/bin/Xw100 ]; then
++  XSERVER=Xw100
++fi
+ 
+ . /etc/profile
+ 
diff --git a/packages/xorg-xserver/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
index de81537f99..64c223f109 100644
--- a/packages/xorg-xserver/xserver-common_1.10.bb
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
@@ -12,6 +12,7 @@ inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
+		   file://w100.patch;patch=1 \
 		   file://poodle-xmodmap-2.6.patch;patch=1"
 
 do_install_append() {
diff --git a/packages/xorg-xserver/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb
index ea3fab6654..ea3fab6654 100644
--- a/packages/xorg-xserver/xserver-common_1.3.bb
+++ b/packages/xserver-common/xserver-common_1.3.bb
diff --git a/packages/xorg-xserver/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index b7b3f554f3..b7b3f554f3 100644
--- a/packages/xorg-xserver/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
diff --git a/packages/xorg-xserver/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb
index de81537f99..de81537f99 100644
--- a/packages/xorg-xserver/xserver-common_1.9.bb
+++ b/packages/xserver-common/xserver-common_1.9.bb