From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 21 Mar 2008 07:30:12 +0000 (+0000)
Subject: openmoko-session2.bb : changes from OM mtn
X-Git-Tag: Release-2010-05/1~7299^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a8a75b38c0b7c7e5355710544a1d6eb82d539d9;p=openembedded.git

openmoko-session2.bb : changes from OM mtn
---

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index f9db990e83..507f85835e 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,33 +1,31 @@
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
+RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r65"
+PR = "r66"
 
 SRC_URI = "\
   file://etc \
   file://matchbox-session \
 "
-S = ${WORKDIR}
 
-inherit update-alternatives
+S = "${WORKDIR}"
 
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "11"
+inherit update-alternatives
 
 do_install() {
-	install -d ${D}${bindir}
-	install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
-	install -d ${D}${sysconfdir}
-	cp -R ${S}/etc/* ${D}${sysconfdir}
-	rm -fR ${D}${sysconfdir}/.svn
-	rm -fR ${D}${sysconfdir}/matchbox/.svn
-	chmod -R 755 ${D}${sysconfdir}/
+        install -d ${D}${bindir}
+        install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
+        install -d ${D}${sysconfdir}
+        cp -R ${S}/etc/* ${D}${sysconfdir}
+        rm -fR ${D}${sysconfdir}/.svn
+        rm -fR ${D}${sysconfdir}/matchbox/.svn
+        chmod -R 755 ${D}${sysconfdir}/
 }
 
+PACKAGE_ARCH = "all"
+
 pkg_postinst_openmoko-session2 () {
 #!/bin/sh -e
 if [ "x$D" != "x" ]; then
@@ -47,7 +45,9 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
 
 }
 
-PACKAGE_ARCH = "all"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "11"
 
 CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
-