[oe-commits] org.oe.dev merge of 'd7806a43c44175ea7383681c5d772583a85125e1'

[mickeyl commit]

merge of 'd7806a43c44175ea7383681c5d772583a85125e1'
     and 'fa875ca906ae242732b2af7d423dc0a019709730'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 883e13b2e61a6af65566bfabc675a52b56a6be49
ViewMTN: http://monotone.openembedded.org/revision.psp?id=883e13b2e61a6af65566bfabc675a52b56a6be49
Files:
1
conf/bitbake.conf
packages/openmoko2/openmoko-session2/matchbox-session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -rd7806a43c44175ea7383681c5d772583a85125e1 -r883e13b2e61a6af65566bfabc675a52b56a6be49
#
# 
# 
# patch "conf/bitbake.conf"
#  from [cb6550c833966af0deba898eb3e14cf54b4bd8c8]
#    to [ee130e54dc68eb5516e965696fbced464a542166]
# 
============================================================
--- conf/bitbake.conf	cb6550c833966af0deba898eb3e14cf54b4bd8c8
+++ conf/bitbake.conf	ee130e54dc68eb5516e965696fbced464a542166
@@ -365,6 +365,7 @@ SRCDATE = "${DATE}"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
+SRCREV = "${@bb.fetch.get_srcrev(d)}"
 
 SRC_URI = "file://${FILE}"
 


#
# mt diff -rfa875ca906ae242732b2af7d423dc0a019709730 -r883e13b2e61a6af65566bfabc675a52b56a6be49
#
# 
# 
# delete "packages/openmoko2/openmoko-session2/matchbox-session"
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
#    to [7c81f0e781a68599e298fc496262f301aea8872d]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
+++ packages/openmoko2/openmoko-session2.bb	7c81f0e781a68599e298fc496262f301aea8872d
@@ -1,16 +1,14 @@ SECTION = "x11"
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r21"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
 	cp -R ${S}/etc ${D}/etc
 	rm -fR ${D}/etc/.svn
 	rm -fR ${D}/etc/matchbox/.svn