merge of '10bc51a56352cd32ff5b7b70a1690ba41c538716'

     and 'a0e7e86db7c5ef00350a27bbe1959df6c1375b2a'

9 files changed, 19 insertions, 3 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index a81263a12a..45a0282265 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -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):
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index f404def82d..416d393ccd 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -5,7 +5,13 @@ mkdir logs
 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 @@ cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${
 
 echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME}
 
+echo ${REV_NOW} > oldrev
+
 rm -Rf logs 
 
diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.5.2.3.bb
index f91fd03ab1..f91fd03ab1 100644
--- a/packages/git/git-native_1.4.4.2.bb
+++ b/packages/git/git-native_1.5.2.3.bb
diff --git a/packages/git/git_1.4.4.2.bb b/packages/git/git_1.5.2.3.bb
index e6a1117316..e6a1117316 100644
--- a/packages/git/git_1.4.4.2.bb
+++ b/packages/git/git_1.5.2.3.bb
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index c998504af1..a129d15aee 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,6 +1,6 @@
 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 
diff --git a/packages/psplash/files/fic-gta01/.mtn2git_empty b/packages/psplash/files/openmoko/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/psplash/files/fic-gta01/.mtn2git_empty
+++ b/packages/psplash/files/openmoko/.mtn2git_empty
diff --git a/packages/psplash/files/fic-gta01/psplash-bar-img.h b/packages/psplash/files/openmoko/psplash-bar-img.h
index ab47c99ef2..ab47c99ef2 100644
--- a/packages/psplash/files/fic-gta01/psplash-bar-img.h
+++ b/packages/psplash/files/openmoko/psplash-bar-img.h
diff --git a/packages/psplash/files/fic-gta01/psplash-hand-img.h b/packages/psplash/files/openmoko/psplash-hand-img.h
index 96dc16c723..96dc16c723 100644
--- a/packages/psplash/files/fic-gta01/psplash-hand-img.h
+++ b/packages/psplash/files/openmoko/psplash-hand-img.h
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index fe62f64e2c..fb7627f631 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -2,7 +2,7 @@ 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