14 files changed, 104 insertions, 79 deletions
diff --git a/packages/xserver-common/files/calibrate-only-if-ts.patch b/packages/xserver-common/files/calibrate-only-if-ts.patch
new file mode 100644
index 0000000000..7be808ba04
--- /dev/null
+++ b/packages/xserver-common/files/calibrate-only-if-ts.patch
@@ -0,0 +1,9 @@
+--- a/run-calibrate.sh.org	2006-10-12 10:19:42.000000000 +0000
++++ b/run-calibrate.sh	2007-02-09 17:54:55.000000000 +0000
+@@ -1,3 +1,5 @@
+ #! /bin/sh
+ 
+-exec xtscal
++if [ -e /dev/input/touchscreen0 ]; then
++    exec xtscal
++fi
diff --git a/packages/xserver-common/files/xserver-imageon.patch b/packages/xserver-common/files/xserver-imageon.patch
new file mode 100644
index 0000000000..6a0447a31f
--- /dev/null
+++ b/packages/xserver-common/files/xserver-imageon.patch
@@ -0,0 +1,14 @@
+Index: xserver-common-1.13/X11/Xserver
+===================================================================
+--- xserver-common-1.13.orig/X11/Xserver
++++ xserver-common-1.13/X11/Xserver
+@@ -17,6 +17,9 @@ fi
+ if [ -f /usr/bin/Xw100 ]; then
+   XSERVER=Xw100
+ fi
++if [ -f /usr/bin/Ximageon ]; then
++  XSERVER=Ximageon
++fi
+ 
+ . /etc/profile
+ 
diff --git a/packages/xserver-common/xserver-common.inc b/packages/xserver-common/xserver-common.inc
new file mode 100644
index 0000000000..229fb4d374
--- /dev/null
+++ b/packages/xserver-common/xserver-common.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
index fecdfbc8a3..69e92ecdf3 100644
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
-
-PACKAGE_ARCH = "all"
+require xserver-common.inc
 
-# we are using a gpe-style Makefile
-inherit gpe
+PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
diff --git a/packages/xserver-common/xserver-common_1.11.bb b/packages/xserver-common/xserver-common_1.11.bb
index 47f9f2b184..6b384699fc 100644
--- a/packages/xserver-common/xserver-common_1.11.bb
+++ b/packages/xserver-common/xserver-common_1.11.bb
@@ -1,13 +1,4 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
+require xserver-common.inc
 
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
diff --git a/packages/xserver-common/xserver-common_1.12.bb b/packages/xserver-common/xserver-common_1.12.bb
index b02ad3f317..dc91d7da68 100644
--- a/packages/xserver-common/xserver-common_1.12.bb
+++ b/packages/xserver-common/xserver-common_1.12.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
+require xserver-common.inc
 
-# we are using a gpe-style Makefile
-inherit gpe
+PR = "r1"
 
 SRC_URI_append = " file://setDPI.sh \
 	           file://rxvt-less-pink.diff;patch=1"
diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb
index d14cad725b..599af1d6f7 100644
--- a/packages/xserver-common/xserver-common_1.13.bb
+++ b/packages/xserver-common/xserver-common_1.13.bb
@@ -1,15 +1,10 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+require xserver-common.inc
 
-PACKAGE_ARCH = "all"
+PR = "r2"
 
-# we are using a gpe-style Makefile
-inherit gpe
-
-SRC_URI_append = " file://setDPI.sh"
+SRC_URI_append = " file://setDPI.sh \
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/packages/xserver-common/xserver-common_1.14.bb b/packages/xserver-common/xserver-common_1.14.bb
new file mode 100644
index 0000000000..48320ba006
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.14.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.15.bb b/packages/xserver-common/xserver-common_1.15.bb
new file mode 100644
index 0000000000..48320ba006
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.15.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb
new file mode 100644
index 0000000000..48320ba006
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.16.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb
index 8980ae2f9f..af2fb894b5 100644
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ b/packages/xserver-common/xserver-common_1.3.bb
@@ -1,11 +1,3 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
+require xserver-common.inc
 
+PR = "r1"
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb
index 9e9c9d2e5e..249576f6da 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xserver-common/xserver-common_1.8.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
-
-PACKAGE_ARCH = "all"
+require xserver-common.inc
 
-# we are using a gpe-style Makefile
-inherit gpe
+PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1"
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb
index 78fe512ff7..a8343a8548 100644
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ b/packages/xserver-common/xserver-common_1.9.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
-
-PACKAGE_ARCH = "all"
+require xserver-common.inc
 
-# we are using a gpe-style Makefile
-inherit gpe
+PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
 		   file://calibrate_zaurusd.patch;patch=1 \
diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb
index ca9f3a7be6..e272ac1a87 100644
--- a/packages/xserver-common/xserver-common_svn.bb
+++ b/packages/xserver-common/xserver-common_svn.bb
@@ -1,20 +1,9 @@
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-PV = "1.12+svn${SRCDATE}"
-PR = "r0"
-
-PACKAGE_ARCH = "all"
+require xserver-common.inc
 
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-
-
-# we are using a gpe-style Makefile
-inherit gpe
-
+PV = "1.12+svn${SRCDATE}"
 S = "${WORKDIR}/xserver-common"
 
 SRC_URI = "${GPE_SVN} \