# HG changeset patch
# User Maciej Seroka <maciejs@symbian.org>
# Date 1278670592 -3600
# Node ID 60b4235c5481b62046e70ffc314c7b8dadc94623
# Parent  1bd0e92dbd45032e731a3893e0f969f2ca289e75# Parent  08f7282dae54d1141b4b43337c4ee7af6b275808
Merge

diff -r 1bd0e92dbd45 -r 60b4235c5481 common/templates/tag-hg-code.ant.xml.ftl
--- a/common/templates/tag-hg-code.ant.xml.ftl	Fri Jul 09 11:14:18 2010 +0100
+++ b/common/templates/tag-hg-code.ant.xml.ftl	Fri Jul 09 11:16:32 2010 +0100
@@ -61,6 +61,8 @@
 				<arg value="-i"/>
 				<arg value="${pkg_detail.dst}"/>
 			</exec>
+			<!-- Remove any '+' on the end of the hash (indicating that the package overwrote some of its own source files during the build) -->
+			<propertyregex property="hash12.${count}" override="true" input="${dollar}{hash12.${count}}" regexp="\+$" replace=""/>
 			<!-- Get the full hash id -->
 			<exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="hash40.${count}" logError="true">
 				<arg value="log"/>
diff -r 1bd0e92dbd45 -r 60b4235c5481 sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Fri Jul 09 11:14:18 2010 +0100
+++ b/sf-package/symbian3_props.ant.xml	Fri Jul 09 11:16:32 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.i"/>
+  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.0"/>
 </project>