From 2a3a0548aa2cc637c6d2c8478dfc6ae6fd627b36 Mon Sep 17 00:00:00 2001
From: Raymond Danks <raymond@edanks.com>
Date: Mon, 24 Jul 2006 20:46:41 +0000
Subject: xorg-data: Update for X11R7.0 and X11R7.0. R

---
 packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb       |  7 ++++++-
 packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb |  6 ++++++
 packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb        | 10 ++++++++--
 packages/xorg-data/xorg-data-common.inc            | 14 +++++++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb

diff --git a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
index aa6c16c802..3071a71a5b 100644
--- a/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
+++ b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
@@ -1 +1,6 @@
-include data-common.inc
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bc09132a05
--- /dev/null
+++ b/packages/xorg-data/xcursor-themes_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxcursor"
+
diff --git a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
index 9b34b04ad2..b3e3a92ac6 100644
--- a/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
+++ b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
@@ -1,3 +1,9 @@
-include data-common.inc
-FILES_${PN} = "/usr/share/X11/*"
+include xorg-data-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
 RDEPENDS = "xkbcomp"
+
+FILES_${PN} += " /usr/share/X11/xkb"
+
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index 47dc922500..ade9fdec58 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -1,12 +1,16 @@
 DESCRIPTION = "X data files"
-SECTION = "x11/data"
-LICENSE= "MIT-X"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/datas"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage () {
+do_stage() {
 	autotools_stage_all
 }
-- 
cgit v1.2.3