[oe-commits] org.oe.dev merge of '5825bf6c4a28f3d0e119e70c98a835c4c371fd59'

[oe commit]

merge of '5825bf6c4a28f3d0e119e70c98a835c4c371fd59'
     and '9533e255d05ed5eb30dca07a71647e870fe55952'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4611a998739efc1fd1e5aed5104fe0bd389f892b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4611a998739efc1fd1e5aed5104fe0bd389f892b
Files:
1
packages/gpe-filemanager/gpe-filemanager_0.30.bb
packages/git/git-native_1.4.4.2.bb
packages/git/git-native_1.5.2.3.bb
packages/git/git_1.4.4.2.bb
packages/git/git_1.5.2.3.bb
packages/psplash/files/fic-gta01
packages/psplash/files/openmoko
classes/base.bbclass
contrib/mtn2cl/mtn2cl.sh
packages/openmoko2/openmoko-today2_svn.bb
packages/psplash/psplash_svn.bb
Diffs:

#
# mt diff -r5825bf6c4a28f3d0e119e70c98a835c4c371fd59 -r4611a998739efc1fd1e5aed5104fe0bd389f892b
#
# 
# 
# add_file "packages/gpe-filemanager/gpe-filemanager_0.30.bb"
#  content [a55ab4f31934ee431d7a73ac816ac41ee85c9d8b]
# 
============================================================
--- packages/gpe-filemanager/gpe-filemanager_0.30.bb	a55ab4f31934ee431d7a73ac816ac41ee85c9d8b
+++ packages/gpe-filemanager/gpe-filemanager_0.30.bb	a55ab4f31934ee431d7a73ac816ac41ee85c9d8b
@@ -0,0 +1,13 @@
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit autotools gpe
+
+PR          = "r0"
+LICENSE     = "GPL"
+DESCRIPTION = "GPE file manager"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
+SECTION = "gpe"
+RDEPENDS    = "gpe-icons"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
+
+FILES_${PN} += " ${datadir}/gpe"


#
# mt diff -r9533e255d05ed5eb30dca07a71647e870fe55952 -r4611a998739efc1fd1e5aed5104fe0bd389f892b
#
# 
# 
# rename "packages/git/git-native_1.4.4.2.bb"
#     to "packages/git/git-native_1.5.2.3.bb"
# 
# rename "packages/git/git_1.4.4.2.bb"
#     to "packages/git/git_1.5.2.3.bb"
# 
# rename "packages/psplash/files/fic-gta01"
#     to "packages/psplash/files/openmoko"
# 
# patch "classes/base.bbclass"
#  from [bfc3a79142b7d13c31f36cebe1bb1c80e8330501]
#    to [814ca4a03b3d5ea4596ae040b150a92ea3076a42]
# 
# patch "contrib/mtn2cl/mtn2cl.sh"
#  from [d4794a871ac74f519ca7da827b1a964c47882a62]
#    to [0d004fb6d3ce380462f24c195693e3753e5445c0]
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [39b64ceee2ffe7f61aa27d0d469968d13b212c5d]
#    to [58011fb129f3c3326348b057bc5b238ac55794b0]
# 
# patch "packages/psplash/psplash_svn.bb"
#  from [f04098f3adc195f405ebb9fd80276fb254aff8de]
#    to [d807d122456dffb57ecb7b98eb6938b27656be98]
# 
============================================================
--- classes/base.bbclass	bfc3a79142b7d13c31f36cebe1bb1c80e8330501
+++ classes/base.bbclass	814ca4a03b3d5ea4596ae040b150a92ea3076a42
@@ -820,6 +820,14 @@ def base_after_parse(d):
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
 
+    # Git packages should DEPEND on git-native
+    srcuri = bb.data.getVar('SRC_URI', d, 1)
+    if "git://" in srcuri:
+        depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+        depends = depends + " git-native:do_populate_staging"
+        bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+				    
+
     mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
     old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
     if (old_arch == mach_arch):
============================================================
--- contrib/mtn2cl/mtn2cl.sh	d4794a871ac74f519ca7da827b1a964c47882a62
+++ contrib/mtn2cl/mtn2cl.sh	0d004fb6d3ce380462f24c195693e3753e5445c0
@@ -5,7 +5,13 @@ export REV_NOW=`mtn automate heads |head
 export LOGNAME=Changelog.`date -u "+%Y%m%d"`
 export REV_NOW=`mtn automate heads |head -n1`
 
-for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
+if test -e oldrev ; then
+    export OLD_REV=`cat oldrev`
+else
+    export OLD_REV="l:\"1 week ago\""
+fi
+
+for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
         export REV=`echo $i | awk -F: '{print $2}'`
         export AUTHOR=`echo $i | awk -F: '{print $1}'`
         export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : '  '{ print $2 }'`
@@ -37,5 +43,7 @@ echo -e "\nIn total $NEW_BUGS bugs have 
 
 echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME}
 
+echo ${REV_NOW} > oldrev
+
 rm -Rf logs 
 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	39b64ceee2ffe7f61aa27d0d469968d13b212c5d
+++ packages/openmoko2/openmoko-today2_svn.bb	58011fb129f3c3326348b057bc5b238ac55794b0
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
 PV = "0.1.0+svn${SVNREV}"
 
 inherit openmoko2 gtk-icon-cache 
============================================================
--- packages/psplash/psplash_svn.bb	f04098f3adc195f405ebb9fd80276fb254aff8de
+++ packages/psplash/psplash_svn.bb	d807d122456dffb57ecb7b98eb6938b27656be98
@@ -1,8 +1,8 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r5"
+PR = "r6"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND