# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1267639505 0
# Node ID 5c14055106362389a0e9e1bf42dca1102eea5cb6
# Parent  e78162015bd14eaab7c678256d0c41d43970944e# Parent  6d6d8bd3e7171ba0081e24971e6f6e02bb25d17f
Merge

diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/adaptation/beagleboard/sources.csv
--- a/symbian3/adaptation/beagleboard/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/adaptation/beagleboard/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/adaptation/qemu/sources.csv
--- a/symbian3/adaptation/qemu/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/adaptation/qemu/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/adaptation/stubs/sources.csv
--- a/symbian3/adaptation/stubs/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/adaptation/stubs/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/app/imgeditor/sources.csv
--- a/symbian3/app/imgeditor/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/app/imgeditor/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/app/phone/sources.csv
--- a/symbian3/app/phone/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/app/phone/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/app/videoeditor/sources.csv
--- a/symbian3/app/videoeditor/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/app/videoeditor/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/appsupport/sources.csv
--- a/symbian3/mw/appsupport/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/appsupport/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/ipappprotocols/sources.csv
--- a/symbian3/mw/ipappprotocols/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/ipappprotocols/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/mds/sources.csv
--- a/symbian3/mw/mds/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/mds/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/platformtools/sources.csv
--- a/symbian3/mw/platformtools/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/platformtools/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/remoteconn/sources.csv
--- a/symbian3/mw/remoteconn/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/remoteconn/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/uiresources/sources.csv
--- a/symbian3/mw/uiresources/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/uiresources/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/uitools/sources.csv
--- a/symbian3/mw/uitools/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/uitools/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/mw/usbservices/sources.csv
--- a/symbian3/mw/usbservices/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/mw/usbservices/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/buildtools/sources.csv
--- a/symbian3/os/buildtools/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/buildtools/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/deviceplatformrelease/sources.csv
--- a/symbian3/os/deviceplatformrelease/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/graphics/sources.csv
--- a/symbian3/os/graphics/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/graphics/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/kernelhwsrv/sources.csv
--- a/symbian3/os/kernelhwsrv/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/kernelhwsrv/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/lbs/sources.csv
--- a/symbian3/os/lbs/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/lbs/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/textandloc/sources.csv
--- a/symbian3/os/textandloc/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/textandloc/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,4 +1,4 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/os/usb/sources.csv
--- a/symbian3/os/usb/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ b/symbian3/os/usb/sources.csv	Wed Mar 03 18:05:05 2010 +0000
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
-http://developer.symbian.org/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/tools/homescreentools/package_definition.xml
--- a/symbian3/tools/homescreentools/package_definition.xml	Wed Mar 03 15:59:16 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-        <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <!-- this needs to be built first, does build order need to be forced with filters? -->
-          <component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/dtdinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="themeinstaller" long-name="Theme Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/themeinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="widgettools" long-name="Widget Tools" level="install">
-          <component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
-          </component>
-          <component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="themetool" long-name="Theme Tool" level="tool">
-          <component name="themetool_build" filter="s60" long-name="Theme Tool Build" class="tool PC">
-            <unit bldFile="/sf/tools/homescreentools/themetool/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
-</SystemDefinition>
diff -r 6d6d8bd3e717 -r 5c1405510636 symbian3/tools/homescreentools/sources.csv
--- a/symbian3/tools/homescreentools/sources.csv	Wed Mar 03 15:59:16 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,RCL_3,layers.sysdef.xml