From: Phil Blundell <philb@gnu.org>
Date: Sun, 21 Nov 2004 12:15:23 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel
X-Git-Tag: Release-2010-05/1~16032
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef6340ab17b0567dab920097d45fd329835b8534;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/21 12:05:29+00:00 nexus.co.uk!pb
put locale data in libx11-locale

BKrev: 41a086dboTR_gkI9U3f8zbGlJNa32A
---

diff --git a/x11/x11_6.2.1.oe b/x11/x11_6.2.1.oe
index e8472d9cb7..db9de85efa 100644
--- a/x11/x11_6.2.1.oe
+++ b/x11/x11_6.2.1.oe
@@ -3,9 +3,10 @@ PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xextensions xau xtrans xdmcp"
 DESCRIPTION = "Base X libs."
-FILES_${PN}_append = " ${datadir}/X11"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
 PROVIDES = "x11"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"