xkeyboard-config: Merge recipes (and fix DEPENDS)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
deleted file mode 100644 (file)
index f0e9753..0000000
--- a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Common X11 Keyboard layouts"
-LICENSE = "MIT"
-DEPENDS = "intltool xkbcomp-native glib-2.0"
-RDEPENDS = "xkbcomp"
-PR = "r2"
-
-SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
-
-inherit autotools_stage
-
-do_install_append () {
-    install -d ${D}/usr/share/X11/xkb/compiled
-    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
-
-FILES_${PN} += "${datadir}/X11/xkb"

diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb
index 86e737fa86d737b47995cc0c01a8791747492d5f..a2f58be9ea8c3da8be968394b7b07dafe7cefbbb 100644 (file)
--- a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb
+++ b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb
@@ -3,6 +3,7 @@ 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"
@@ -12,6 +13,7 @@ FILES_${PN} += "${datadir}/X11/xkb"
 
 inherit autotools_stage pkgconfig
 
-
-
-
+do_install_append () {
+    install -d ${D}/usr/share/X11/xkb/compiled
+    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
+}