# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1260964894 0
# Node ID def0946dfca5405708c1a2a420bdada48d0cb1f4
# Parent  af63f60bd9d004efb40ba934417649304e9ffc30# Parent  e2c7b9bb945c39debefae6f16184401c104381c9
Merge tags

diff -r e2c7b9bb945c -r def0946dfca5 symbian2/micro/job_props.ant.xml
--- a/symbian2/micro/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian2/micro/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -7,7 +7,7 @@
 
     <property name="sf.drive.space.needed" value="2G"/>
 
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.1" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.2" />
 
     <property name="sf.spec.corebuildversion" value="week19"/>
     
diff -r e2c7b9bb945c -r def0946dfca5 symbian2/single/job_props.ant.xml
--- a/symbian2/single/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian2/single/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.1" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.2" />
 
     <property name="sf.spec.job.name" value="symbian2"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
diff -r e2c7b9bb945c -r def0946dfca5 symbian2/split/job_props.ant.xml
--- a/symbian2/split/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian2/split/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
     
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.1" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.2" />
     
     <property name="sf.spec.job.name" value="symbian2"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
diff -r e2c7b9bb945c -r def0946dfca5 symbian3/micro/job_props.ant.xml
--- a/symbian3/micro/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian3/micro/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.c" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.d" />
 
     <property name="sf.spec.corebuildversion" value="week37"/>
     
diff -r e2c7b9bb945c -r def0946dfca5 symbian3/single/job_props.ant.xml
--- a/symbian3/single/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian3/single/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.c" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.d" />
 
     <property name="sf.spec.job.name" value="symbian3"/>
     <property name="sf.spec.corebuildversion" value="week37"/>
diff -r e2c7b9bb945c -r def0946dfca5 symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian3/split/job_props.ant.xml	Wed Dec 16 12:01:34 2009 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
     
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.c" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.d" />
 
     <property name="sf.spec.job.name" value="symbian3"/>
     <property name="sf.spec.corebuildversion" value="week37"/>
@@ -30,7 +30,7 @@
 
     <!-- get full source env and binaries from pdk -->
     <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.1_patched_s3" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.1_patched_s3_evalid" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
diff -r e2c7b9bb945c -r def0946dfca5 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Tue Dec 15 14:31:00 2009 +0000
+++ b/symbian3/split/sources_fcl.csv	Wed Dec 16 12:01:34 2009 +0000
@@ -10,23 +10,23 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
@@ -50,7 +50,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
@@ -66,7 +66,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
@@ -76,7 +76,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
@@ -99,20 +99,20 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/unref/,/sf/os/unref,branch,default,
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml