5 files changed, 24 insertions, 11 deletions
diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc
index 4c3d6e8987..75ac0f1205 100644
--- a/packages/xorg-doc/xorg-doc-common.inc
+++ b/packages/xorg-doc/xorg-doc-common.inc
@@ -3,10 +3,9 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/docs"
 LICENSE = "MIT-X"
 
-#DEPENDS = ""
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/doc/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
+
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-doc/xorg-docs_1.0.1.bb b/packages/xorg-doc/xorg-docs_1.0.1.bb
new file mode 100644
index 0000000000..df775f85b0
--- /dev/null
+++ b/packages/xorg-doc/xorg-docs_1.0.1.bb
@@ -0,0 +1,11 @@
+require xorg-doc-common.inc
+
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+
+DEPENDS += " intltool"
+
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/doc"
+
diff --git a/packages/xorg-doc/xorg-docs_1.2.bb b/packages/xorg-doc/xorg-docs_1.2.bb
new file mode 100644
index 0000000000..df775f85b0
--- /dev/null
+++ b/packages/xorg-doc/xorg-docs_1.2.bb
@@ -0,0 +1,11 @@
+require xorg-doc-common.inc
+
+DESCRIPTION = "The documentation in this package is from xc/doc in the monolithic \
+source tree."
+
+DEPENDS += " intltool"
+
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/doc"
+
diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb
index 18a3ef964a..053ca2eaaa 100644
--- a/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb
+++ b/packages/xorg-doc/xorg-sgml-doctools_1.1.1.bb
@@ -1,8 +1,4 @@
 require xorg-doc-common.inc
 PE = "1"
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 FILES_${PN} += " /usr/share/X11/sgml"
diff --git a/packages/xorg-doc/xorg-sgml-doctools_1.2.bb b/packages/xorg-doc/xorg-sgml-doctools_1.2.bb
index 18a3ef964a..053ca2eaaa 100644
--- a/packages/xorg-doc/xorg-sgml-doctools_1.2.bb
+++ b/packages/xorg-doc/xorg-sgml-doctools_1.2.bb
@@ -1,8 +1,4 @@
 require xorg-doc-common.inc
 PE = "1"
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
-
 FILES_${PN} += " /usr/share/X11/sgml"