summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-14 21:36:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:20 -0800
commit1cdacff50e7bf480a1a4d82628f776fd0a42390b (patch)
tree352d81b64c4674fd6a079a4186b71a2b66ab66e8
parent4878b3ced8b901f060a5cc7b8a082698f6c2f0e8 (diff)
downloadpoky-1cdacff50e7bf480a1a4d82628f776fd0a42390b.tar.gz
matchbox-keyboard: general clean up
Re-order variables, use $PN more, and merge the -dbg packages together. (From OE-Core rev: 1dfe4f5d49bbbaf1adc28dacac92b5288021309b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb20
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index a7091d2519..6841596f42 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -1,6 +1,7 @@
1DESCRIPTION = "Matchbox virtual keyboard for X11" 1DESCRIPTION = "Matchbox virtual keyboard for X11"
2HOMEPAGE = "http://matchbox-project.org" 2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.openedhand.com/" 3BUGTRACKER = "http://bugzilla.openedhand.com/"
4SECTION = "x11"
4 5
5LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -8,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b" 9 file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
9 10
10DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" 11DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
11RDEPENDS_${PN} = "formfactor dbus-wait" 12
12SECTION = "x11"
13SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac" 13SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
14PV = "0.0+git${SRCPV}" 14PV = "0.0+git${SRCPV}"
15PR = "r4" 15PR = "r4"
@@ -26,20 +26,20 @@ inherit autotools pkgconfig gettext gtk-immodules-cache
26 26
27EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" 27EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
28 28
29PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \ 29PACKAGES += "${PN}-im ${PN}-applet"
30 matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
31 30
32FILES_${PN} = "${bindir}/* \ 31FILES_${PN} = "${bindir}/ \
33 ${sysconfdir} \ 32 ${sysconfdir} \
34 ${datadir}/applications \ 33 ${datadir}/applications \
35 ${datadir}/pixmaps \ 34 ${datadir}/pixmaps \
36 ${datadir}/matchbox-keyboard" 35 ${datadir}/matchbox-keyboard"
37 36
38FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so" 37FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
39FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" 38
39FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
40
41FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
40 42
41FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
42FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
43 43
44do_install_append () { 44do_install_append () {
45 install -d ${D}/${sysconfdir}/X11/Xsession.d/ 45 install -d ${D}/${sysconfdir}/X11/Xsession.d/
@@ -50,3 +50,5 @@ do_install_append () {
50} 50}
51 51
52GTKIMMODULES_PACKAGES = "${PN}-im" 52GTKIMMODULES_PACKAGES = "${PN}-im"
53
54RDEPENDS_${PN} = "formfactor dbus-wait"