5 files changed, 22 insertions, 17 deletions
diff --git a/packages/matchbox-wm/matchbox-wm/collie/kbdconfig b/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/collie/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm/kbdconfig b/packages/matchbox-wm/matchbox-wm/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig b/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm/simpad/kbdconfig
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index 9bf7be1e69..11447fe78a 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -3,14 +3,15 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR = "r1" 
+PR = "r2" 
 
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
+	   file://kbdconfig"
 
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig update-alternatives
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/matchbox \
@@ -19,13 +20,14 @@ FILES_${PN} = "${bindir} \
 	       ${datadir}/themes/Default/matchbox \
 	       ${datadir}/themes/MBOpus/matchbox"
 
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
 
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
 
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+do_install_prepend() {
+	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
 }
 
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index 606e3ebc01..fdf38d6e68 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -4,13 +4,20 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 PV = "0.9cvs${CVSDATE}"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
+	   file://kbdconfig"
 
 S = "${WORKDIR}/matchbox-window-manager"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
 
 FILES_${PN} = "${bindir} \
                ${datadir}/matchbox \
@@ -21,11 +28,7 @@ FILES_${PN} = "${bindir} \
 
 EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
 
-pkg_postinst() {
-update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/matchbox-session 10
-}
-
-pkg_postrm() {
-update-alternatives --remove x-window-manager ${bindir}/matchbox-session
+do_install_prepend() {
+	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
 }