summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2007-01-25 17:53:58 +0000
committerPhil Blundell <philb@gnu.org>2007-01-25 17:53:58 +0000
commit10347e09692baa998b8be76ce139f214292e2eb1 (patch)
tree427615d7d363d79b71729be68ac474e48daa2b51
parent08a0feb8971f02b65d142690ea5be4faa303690c (diff)
xserver-xorg: fewer rdepends, rprovides
-rw-r--r--packages/xorg-xserver/xorg-xserver-common.inc5
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb2
3 files changed, 4 insertions, 5 deletions
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 68e39826c0..b1cbd5c472 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-RPROVIDES = "virtual/xserver"
+RPROVIDES_${PN} = "virtual/xserver"
PROVIDES = "virtual/xserver"
DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
@@ -14,7 +14,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native"
-RDEPENDS="rgb"
+RDEPENDS_${PN} = "rgb"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \
@@ -24,7 +24,6 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-
EXTRA_OECONF = "--disable-builddocs"
PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx"
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
index 06270e4316..57d57fda84 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
require xorg-xserver-common.inc
-PR = "r1"
+PR = "r2"
#DESCRIPTION = ""
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
index acf1f2abb0..6ee935a21e 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -2,7 +2,7 @@ require xorg-xserver-common.inc
SRC_URI += "file://drmfix.patch;patch=1"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "