[oe-commits] org.oe.dev openmoko-session2.bb : changes from OM mtn

[xora commit]

openmoko-session2.bb : changes from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 3447c93047f153922a4e64420c682c7b0d9f6e9a
ViewMTN: http://monotone.openembedded.org/revision/info/3447c93047f153922a4e64420c682c7b0d9f6e9a
Files:
1
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -rb7dee0a7ff0ad33295b47b62379232c653485c9f -r3447c93047f153922a4e64420c682c7b0d9f6e9a
#
#
#
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [7212c808e7087d92aab3ce2cda5c8d3ba3ee695b]
#    to [4b7a7a8a5b44f7b603a679a33170012bd24d5c16]
#
============================================================
--- packages/openmoko2/openmoko-session2.bb	7212c808e7087d92aab3ce2cda5c8d3ba3ee695b
+++ packages/openmoko2/openmoko-session2.bb	4b7a7a8a5b44f7b603a679a33170012bd24d5c16
@@ -1,33 +1,31 @@ SECTION = "x11"
 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${sys
 
 }
 
-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"
-