From d6615c294004e231278b881568a1a2cf4f85a3e8 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <dexuan.cui@intel.com>
Date: Fri, 2 Jul 2010 15:22:51 +0800
Subject: xkeyboard-config: upgrade to the latest version 1.9

Updated SRC_URI because from version 1.9 on, the link changed to a new place.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/packages/xorg-lib/xkeyboard-config_1.6.bb | 19 -------------------
 meta/packages/xorg-lib/xkeyboard-config_1.9.bb | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/xkeyboard-config_1.6.bb
 create mode 100644 meta/packages/xorg-lib/xkeyboard-config_1.9.bb

diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb
deleted file mode 100644
index 9a7494d48..000000000
--- a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
-DESCRIPTION = "Keyboard configuration database for X Window"
-SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "intltool xkbcomp-native glib-2.0"
-PR = "r2"
-
-EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
-
-RDEPENDS_${PN} += "xkbcomp"
-FILES_${PN} += "${datadir}/X11/xkb"
-
-inherit autotools pkgconfig
-
-do_install_append () {
-    install -d ${D}/usr/share/X11/xkb/compiled
-    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.9.bb b/meta/packages/xorg-lib/xkeyboard-config_1.9.bb
new file mode 100644
index 000000000..0e59bd506
--- /dev/null
+++ b/meta/packages/xorg-lib/xkeyboard-config_1.9.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Keyboard configuration database for X Window"
+HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
+BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config"
+
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
+
+SRC_URI = "http://people.freedesktop.org/~svu/xkeyboard-config-${PV}.tar.bz2"
+SECTION = "x11/libs"
+DEPENDS = "intltool xkbcomp-native glib-2.0"
+
+PR = "r0"
+
+EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
+
+RDEPENDS_${PN} += "xkbcomp"
+FILES_${PN} += "${datadir}/X11/xkb"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+    install -d ${D}/usr/share/X11/xkb/compiled
+    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
+}
-- 
cgit v1.2.3