[oe-commits] Steve Sakoman : xserver-xorg: remove dependency on xorg-minimal-fonts

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: dd0c9cb1e6babb0219ae7bd2580af9013d1737d7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=dd0c9cb1e6babb0219ae7bd2580af9013d1737d7

Author: Steve Sakoman <steve at sakoman.com>
Date:   Thu Jun 24 20:05:32 2010 -0700

xserver-xorg: remove dependency on xorg-minimal-fonts

this is no longer necessary, and infact leads to a conflict with font-alias

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/xorg-xserver/xorg-xserver-common.inc |    4 ++--
 recipes/xorg-xserver/xserver-xorg_1.7.4.bb   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index adf7c96..a2a43ef 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 PROVIDES = "virtual/xserver"
 
@@ -48,7 +48,7 @@ EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no "
 
 PACKAGES =+ "xserver-security-policy"
 FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy"
-RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf"
+RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config rgb xserver-xorg-conf"
 
 PACKAGES =+ "${PN}-sdl ${PN}-fbdev ${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
index 8dbf5f8..6de63c8 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -1,7 +1,7 @@
 require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto"
 PE = "2"
 PR = "${INC_PR}.1"