5 files changed, 16 insertions, 37 deletions
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
deleted file mode 100644
index 69e92ecdf3..0000000000
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-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() {
-	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+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
deleted file mode 100644
index af2fb894b5..0000000000
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 249576f6da..0000000000
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-SRC_URI_append = " file://setDPI.sh \
-		   file://calibrate_zaurusd.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.9.bb b/packages/xserver-common/xserver-common_1.9.bb
deleted file mode 100644
index a8343a8548..0000000000
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-common.inc
-
-PR = "r2"
-
-SRC_URI_append = " file://setDPI.sh \
-		   file://calibrate_zaurusd.patch;patch=1 \
-		   file://poodle-xmodmap-2.6.patch;patch=1 \
-		   file://rxvt-less-pink.diff;patch=1"
-
-do_install_append() {
-	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}