xorg-xserver: X11 cleanup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2082 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
similarity index 99%
rename from meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
rename to meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 2ca4fab50bd91539342053fae69a9a1974db02c5..62b509a2ef0449687ae13be72de3461ae0699706 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
 
-PR = "r5"
+PE = "1"
 
 COMPATIBLE_MACHINE = "nokia(800|770)"
 

diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
similarity index 95%
rename from meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
rename to meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
index 053c0abf063758655fe9dc8ec55a28646cc955fe..0adce50bbb5bac12e44f29853548f5e0ea7acec0 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -10,7 +10,7 @@ DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting ge
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR="r2"
+PE = "1"
 
 FILES_${PN} = "${libdir}/xserver"
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
@@ -21,7 +21,7 @@ RDEPENDS_xserver-kdrive-fbdev = "${PN}"
 RDEPENDS_xserver-kdrive-fake = "${PN}"
 RDEPENDS_xserver-kdrive-xephyr = "${PN}"
 
-SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
+SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-1.1.0.tar.bz2 \
        file://kmode.patch;patch=1 \
        file://disable-apm.patch;patch=1 \
        file://no-serial-probing.patch;patch=1 \

diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb
similarity index 94%
rename from meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
rename to meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb
index 3db5c640c75303797c731c2d1030f3acb7a42673..7881bb21f6c18680cf6236d25fad1dfe8caf3a8d 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb
@@ -4,6 +4,8 @@ SRC_URI += "file://drmfix.patch;patch=1"
 
 EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
 
+PE = "1"
+
 #DESCRIPTION = ""
 
 #DEPENDS += " "