Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/24 02:33:48+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/24 02:33:16+00:00 (none)!cwiiis
Update user-own-collie-devs patch for gpe-login.

2005/02/24 02:21:03+00:00 (none)!cwiiis
Use user-own-collie-devs patch in gpe-login again.

2005/02/23 19:50:06-06:00 ti.com!kergoth
Add OpenOMAP, a simple OE built distribution for TI OMAP development platforms.

2005/02/23 19:46:00-06:00 ti.com!kergoth
Set MODUTILS = '26' in the omap1610h2.conf, since the only omap kernel we've got is 2.6 anyway.

2005/02/24 01:40:43+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/23 19:40:28-06:00 ti.com!kergoth
gnupg2: kill the unnecessary do_install docdir rearranging, add /usr/share/gnupg to FILES_PN.

2005/02/24 01:39:57+00:00 (none)!cwiiis
Make keylaunch use custom keylaunchrc (empty for collie, otherwise default).

2005/02/24 01:17:28+00:00 (none)!cwiiis
Use update-alternatives and custom kbdconfig in matchbox svn as well.

2005/02/23 16:21:10+00:00 (none)!cwiiis
Make gpe-appmgr only install on the gpe-image of bigscreen devices.

2005/02/23 16:14:27+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/02/23 13:38:49+00:00 (none)!cwiiis
Merge

2005/02/23 12:41:55+00:00 (none)!cwiiis
Move loading of libgtkstylus to Xsession.d from profile.d.

2005/02/23 12:34:56+00:00 (none)!cwiiis
Remove apm_bios patch and make Xsession more debian-like (source all scripts) in gpe-dm.

2005/02/23 12:33:12+00:00 (none)!cwiiis
Add keysym for power button on collie for X

2005/02/22 10:44:46+00:00 (none)!cwiiis
Merge matchbox-wm changes, and make use update-alternatives class.

2005/02/22 02:52:05+00:00 (none)!cwiiis
Use custom kbdconfig with matchbox-wm (for simpad and collie)

2005/02/18 22:36:53+00:00 (none)!cwiiis
Add --with-env-editor switch to configure of sudo

2005/02/18 22:35:54+00:00 (none)!cwiiis
Really get rid of the apm_bios removal patch for collie...

2005/02/18 22:33:47+00:00 (none)!cwiiis
-Update gpe-login patch to set ownership of devices
-Remove patch that deletes /dev/apm_bios for collie - no longer necessary

BKrev: 421d3e9bcU67BQXgiWhQfs1uU1AqSg

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
 }