Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
	recipes/images/pandora-xfce-image.bb

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 5479002..fa2d138 100755 (executable)
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -27,7 +27,7 @@ PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo GIT-VERSION: `git log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "echo Version: 1.7.0.3 - R1 Codename Zaxxon, Hotfix 7, Beta 2>> ${PANDORA_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Version: 1.7.0.5 - R1 Codename Zaxxon, Hotfix 7, Beta 2>> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};"
 ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};"