# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1247053673 -3600
# Node ID 14550681ff317e87a02f50712143aea260513b34
# Parent  85cc843f238dfca994dc740e34c638f6ec6a83ac# Parent  71d9345f5c386bc8d35596366c6e575c930f09e8
Merge commit

diff -r 71d9345f5c38 -r 14550681ff31 clean/sources.csv
--- a/clean/sources.csv	Tue Jul 07 14:43:57 2009 +0100
+++ b/clean/sources.csv	Wed Jul 08 12:47:53 2009 +0100
@@ -66,7 +66,6 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mobiletv/,/sf/mw/mobiletv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,tip,tag,default,layers.sysdef.xml
diff -r 71d9345f5c38 -r 14550681ff31 clean/sources_fcl.csv
--- a/clean/sources_fcl.csv	Tue Jul 07 14:43:57 2009 +0100
+++ b/clean/sources_fcl.csv	Wed Jul 08 12:47:53 2009 +0100
@@ -6,7 +6,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contacts/,/sf/app/contacts,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/contacts/,/sf/app/contacts,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conversations/,/sf/app/conversations,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,tip,tag,default,layers.sysdef.xml
@@ -27,7 +27,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/organizer/,/sf/app/organizer,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/phone/,/sf/app/phone,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/photos/,/sf/app/photos,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/app/photos/,/sf/app/photos,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/poc/,/sf/app/poc,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/printing/,/sf/app/printing,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/profile/,/sf/app/profile,tip,tag,default,layers.sysdef.xml
@@ -66,7 +66,6 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mobiletv/,/sf/mw/mobiletv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,tip,tag,default,layers.sysdef.xml
diff -r 71d9345f5c38 -r 14550681ff31 clean/sysdefs/system_model_os.xml
--- a/clean/sysdefs/system_model_os.xml	Tue Jul 07 14:43:57 2009 +0100
+++ b/clean/sysdefs/system_model_os.xml	Wed Jul 08 12:47:53 2009 +0100
@@ -180,6 +180,9 @@
         </component>
         <component name="S60 Compatibility Headers" filter="gt">
           <unit version="9.4" bldFile="os\ossrv\genericservices\s60compatibilityheaders\group94" mrp="os\ossrv\genericservices\s60compatibilityheaders\group94\tools_s60_header_compat94.mrp"/>
+          <unit version="9.5" bldFile="os\ossrv\genericservices\s60compatibilityheaders\group95" mrp="os\ossrv\genericservices\s60compatibilityheaders\group95\tools_s60_header_compat95.mrp" filter="!tb91sf"/>
+          <unit version="9.6" bldFile="os\ossrv\genericservices\s60compatibilityheaders\group96" mrp="os\ossrv\genericservices\s60compatibilityheaders\group96\tools_s60_header_compat96.mrp" filter="!tb91sf"/>
+          <unit version="Future" bldFile="os\ossrv\genericservices\s60compatibilityheaders\groupfuture" mrp="os\ossrv\genericservices\s60compatibilityheaders\groupfuture\tools_s60_header_compatfuture.mrp" filter="!tb91sf"/>
         </component>
         <component name="SMOKETEST" filter="gt">
           <unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\Group\testtools_smoketest.mrp"/>
@@ -251,6 +254,7 @@
         </component>
         <component name="Developer Library Help">
           <unit version="9.4" bldFile="os\buildtools\devlib\devlibhelp\group\devlib94" mrp="os\buildtools\devlib\devlibhelp\group\devlib94\developerlibrary_doc_html.mrp"/>
+          <unit version="9.5" bldFile="os\buildtools\devlib\devlibhelp\group\devlib95" mrp="os\buildtools\devlib\devlibhelp\group\devlib95\developerlibrary_doc_html.mrp" filter="!tb91sf"/>
         </component>
         <component name="Developer Library Source" filter="gt">
           <unit bldFile="os\buildtools\devlib\devlibhelp\securitysupplement\doc_source" mrp="os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp"/>
@@ -513,6 +517,9 @@
         <component name="Baseband Channel Adaptor for C32" plugin="Y" introduced="8.1">
           <unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group\networking_c32bca.mrp"/>
         </component>
+        <component name="Baseband Channel Adaptor for ISC" plugin="Y" filter="!tb91sf">
+          <unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforisc\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforisc\group\networking_bcatoisc.mrp"/>
+        </component>
       </collection>
     </layer>
     <layer name="Kernel Services" levels="kernel user">
@@ -585,6 +592,11 @@
             <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="os\kernelhwsrv\kernel\eka\drivers\usbc\base_e32_drivers_usbcli.mrp"/>
           </component>
         </collection>
+        <collection name="Graphics LDDs" level="specific">
+          <component name="Surface Manager LDD" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
+          </component>
+        </collection>
         <collection name="Localisation" level="specific">
           <component name="Locale Support" contract="Symbian_Affiliate" plugin="Y">
             <unit bldFile="os\kernelhwsrv\localisation\localesupport" mrp="os\kernelhwsrv\localisation\localesupport\mmpfiles\base_loce32.mrp"/>
@@ -704,6 +716,14 @@
             <component name="File-based Certificate and Key Stores" introduced="8.0">
               <unit bldFile="os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
             </component>
+            <component name="Security Common Utils" introduced="8.0" filter="!tb91sf">
+              <unit bldFile="os\security\cryptomgmtlibs\securitycommonutils\group" mrp="os\security\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
+            </component>            
+          </collection>
+          <collection name="Authorisation" level="data-services">
+            <component name="User Prompt Service" introduced="9.5" filter="!tb91sf">
+              <unit bldFile="os\security\authorisation\userpromptservice\group" mrp="os\security\authorisation\userpromptservice\group\security_ups.mrp"/>
+            </component>
           </collection>
           <collection name="Generic Open Libraries" level="translation">
             <component name="C Standard Library" introduced="ER5">
@@ -723,6 +743,15 @@
             <component name="Strong Cryptography Library" contract="Symbian_Strong_Cryptography" filter="gt">
               <unit bldFile="os\security\crypto\weakcrypto\strong" mrp="os\security\crypto\weakcrypto\group\security_crypto_strong.mrp"/>
             </component>
+            <component name="Weak Crypto SPI" filter="gt,!tb91sf" introduced="9.5">
+              <unit bldFile="os\security\crypto\weakcryptospi\group" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
+            </component>
+            <component name="Strong Crypto SPI" contract="Symbian_Strong_Cryptography" filter="gt,!tb91sf" introduced="9.5">
+              <unit bldFile="os\security\crypto\weakcryptospi\strong" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
+            </component>
+            <component name="Crypto SPI Plugins" contract="Symbian_Strong_Cryptography" filter="gt,!tb91sf" plugin="Y" introduced="9.5">
+              <unit bldFile="os\security\cryptoplugins\cryptospiplugins\group" mrp="os\security\cryptoplugins\cryptospiplugins\group\security_cryptospi_plugins.mrp"/>
+            </component>
           </collection>
           <collection name="Low Level Libraries and Frameworks" level="app-libs">
            <component name="Plugin Framework" introduced="6.2">
@@ -733,6 +762,9 @@
             </component>
           </collection>
           <collection name="Resource Management" level="physical-abstraction">
+            <component name="Feature Manager" introduced="9.6" filter="!tb91sf">
+              <unit bldFile="os\persistentdata\featuremgmt\featuremgr\group" mrp="os\persistentdata\featuremgmt\featuremgr\group\syslibs_featmgr.mrp"/>
+            </component>
             <component name="Feature Registry" introduced="9.2" deprecated="9.6">
               <unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="os\persistentdata\featuremgmt\featureregistry\group\syslibs_featreg.mrp"/>
             </component>
@@ -833,12 +865,15 @@
           <collection name="Data Comms Server" level="servers_and_extensions">
             <component name="ESock Server">
               <unit version="2" bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp"/>
+              <unit version="3" bldFile="os\unref\orphan\comgen\comms-infras\esock\group" mrp="os\unref\orphan\comgen\comms-infras\esock\group\comms-infras_esock.mrp" filter="!tb91sf"/>
             </component>
             <component name="ESock Server Config" introduced="9.1" class="config">
               <unit version="2" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp"/>
+              <unit version="3" mrp="os\unref\orphan\comgen\comms-infras\esock\group\comms-infras_esock-config.mrp" filter="!tb91sf"/>
             </component>
             <component name="Network Interface Manager" introduced="ER5U">
               <unit version="1" bldFile="os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="os\commsfw\datacommsserver\networkinterfacemgr\group\comms-infras_nifman.mrp"/>
+              <unit version="2" bldFile="os\unref\orphan\comgen\comms-infras\nifman\group" mrp="os\unref\orphan\comgen\comms-infras\nifman\group\comms-infras_nifman.mrp" filter="!tb91sf"/>
             </component>
             <component name="Networking Dialog API" introduced="6.1">
               <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\group" mrp="os\commsfw\datacommsserver\networkingdialogapi\group\networking_dialog.mrp"/>
@@ -1007,6 +1042,15 @@
             <component name="IP SCPR" plugin="Y" introduced="9.1">
               <unit bldFile="os\networkingsrv\networkcontrol\ipscpr\group" mrp="os\networkingsrv\networkcontrol\ipscpr\group\networking_ipscpr.mrp"/>
             </component>
+            <component name="QoS IP SCPR" plugin="Y" filter="!tb91sf">
+              <unit bldFile="os\networkingsrv\networkcontrol\qosipscpr\group" mrp="os\networkingsrv\networkcontrol\qosipscpr\group\networking_qosipscpr.mrp"/>
+            </component>
+            <component name="IP Network Layer" plugin="Y" introduced="9.5" filter="!tb91sf">
+              <unit bldFile="os\networkingsrv\networkcontrol\ipnetworklayer\group" mrp="os\networkingsrv\networkcontrol\ipnetworklayer\group\networking_ipproto.mrp"/>
+            </component>
+            <component name="IP Transport Layer" plugin="Y" filter="!tb91sf">
+              <unit bldFile="os\networkingsrv\networkcontrol\iptransportlayer\group" mrp="os\networkingsrv\networkcontrol\iptransportlayer\group\networking_iptransport.mrp"/>
+            </component>
             <component name="IP CPR Shim" plugin="Y" deprecated="9.6">
               <unit bldFile="os\networkingsrv\networkcontrol\ipcprshim\group" mrp="os\networkingsrv\networkcontrol\ipcprshim\group\networking_shimcpr.mrp"/>
             </component>
@@ -1039,6 +1083,9 @@
             <component name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
               <unit bldFile="os\cellularsrv\telephonyprotocols\qos3gppcpr\group" mrp="os\cellularsrv\telephonyprotocols\qos3gppcpr\group\networking_Qos3GPP.mrp"/>
             </component>
+            <component name="PDP Layer" plugin="Y" introduced="9.5" filter="!tb91sf">
+              <unit bldFile="os\cellularsrv\telephonyprotocols\pdplayer\group" mrp="os\cellularsrv\telephonyprotocols\pdplayer\group\networking_pdp.mrp"/>
+            </component>
           </collection>
           <collection name="Link Layer Protocols" level="bearer-manager">
             <component name="Ethernet NIF" plugin="Y">
@@ -1049,9 +1096,11 @@
             </component>
             <component name="PPP NIF" plugin="Y">
               <unit version="1" bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp"/>
+              <unit version="2" bldFile="os\unref\orphan\comgen\networking\ppp\group" mrp="os\unref\orphan\comgen\networking\ppp\group\networking_ppp.mrp" filter="!tb91sf"/>
             </component>
          <component name="PPP Config">
               <unit version="1" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp-config.mrp"/>
+              <unit version="2" mrp="os\unref\orphan\comgen\networking\ppp\group\networking_ppp-config.mrp" filter="!tb91sf"/>
             </component>
             <component name="SLIP NIF" plugin="Y">
               <unit bldFile="os\networkingsrv\linklayerprotocols\slipnif\group" mrp="os\networkingsrv\linklayerprotocols\slipnif\group\networking_slip.mrp"/>
@@ -1084,9 +1133,15 @@
 		</collection>
           <collection name="USB Management" level="utilities">
             <component name="USB Manager">
+              <unit version="1" bldFile="os\unref\orphan\comgen\ser-comms\usb\group" mrp="os\unref\orphan\comgen\ser-comms\usb\group\ser-comms_usb.mrp" filter="!tb91sf"/>
               <unit version="2" bldFile="os\shortlinksrv\usbmgmt\usbmgr\group" mrp="os\shortlinksrv\usbmgmt\usbmgr\group\usb_manager.mrp"/>
             </component>
           </collection>
+          <collection name="USB Function Drivers" level="utilities">
+            <component name="Mass Storage Driver" introduced="9.5" filter="!tb91sf">
+              <unit bldFile="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group" mrp="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group\connectivity_usbms.mrp"/>
+            </component>
+          </collection>
           <collection name="Short Link" level="servers_and_extensions">
             <component name="Bluetooth HCI Framework 2" introduced="9.2">
               <unit bldFile="os\shortlinksrv\bthci\bthci2\group" mrp="os\shortlinksrv\bthci\bthci2\group\bluetooth_hci_v2_framework.mrp"/>
@@ -1314,6 +1369,9 @@
           <component name="OpenGL ES Implementation" contract="OPENGL" filter="gt" introduced="8.0">
             <unit bldFile="os\graphics\opengles\openglesimplementation\group\" mrp="os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp"/>
           </component>
+          <component name="OpenVG Implementation" contract="Symbian_Exclude" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\openvg\openvgimplementation\group\" mrp="os\graphics\openvg\openvgimplementation\group\graphics_openvg.mrp"/>
+          </component>
           <component name="EGL Implementation" contract="Symbian_Exclude" introduced="9.4">
             <unit bldFile="os\graphics\egl\eglimplementation\group\" mrp="os\graphics\egl\eglimplementation\group\graphics_egl.mrp"/>
           </component>
@@ -1329,6 +1387,22 @@
             <unit bldFile="os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="os\graphics\graphicsdeviceinterface\colourpalette\group\graphics_palette.mrp"/>
           </component>
         </collection>
+        <collection name="Core Graphics Resources" level="internal-adaptations">
+          <component name="Common Graphics Headers" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\graphicsutils\commongraphicsheaders\group" mrp="os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp"/>
+          </component>
+        </collection>
+        <collection name="Graphics Surface Composition" level="engines">
+          <component name="Graphics Composition Engine" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\graphicscomposition\graphicscompositionengine\group" mrp="os\graphics\graphicscomposition\graphicscompositionengine\group\graphics_gce.mrp"/>
+          </component>
+          <component name="Composition Engine Adaptation" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\graphicscomposition\compositionengineadaptation\group" mrp="os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp"/>
+          </component>
+          <component name="Graphics Resource Content Update" introduced="9.5" filter="!tb91sf">
+            <unit bldFile="os\graphics\graphicscomposition\surfaceupdate\group" mrp="os\graphics\graphicscomposition\surfaceupdate\group\graphics_surfaceupdate.mrp"/>
+          </component>
+        </collection>
       </block>
       <block name="Location Based Services" levels="data-acquisition adaptation management application-interface">
         <collection name="Location Request Management" level="application-interface">
@@ -1441,12 +1515,23 @@
           <component name="Reference DRM Agent" introduced="8.0">
             <unit bldFile="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group" mrp="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
           </component>
+          <component name="CAF Streaming Support" introduced="9.5" filter="!tb91sf">
+             <unit bldFile="os\security\contentmgmt\cafstreamingsupport\group" mrp="os\security\contentmgmt\cafstreamingsupport\group\security_streamingcaf.mrp"/>            
+          </component>                  
         </collection>
         <collection name="Printing Support" level="specific">
           <component name="Printing UI Support">
             <unit bldFile="mw\appsupport\printingsupport\printinguisupport\group" mrp="mw\appsupport\printingsupport\printinguisupport\group\app-framework_print.mrp"/>
           </component>
         </collection>
+        <collection name="Open Environment Utilities" level="generic">
+          <component name="Command Shell" filter="!tb91sf">
+            <unit bldFile="mw\appsupport\openenvutils\commandshell\group" mrp="mw\appsupport\openenvutils\commandshell\group\oetools_zsh.mrp"/>
+          </component>
+          <component name="Telnet Server" filter="!tb91sf">
+            <unit bldFile="mw\appsupport\openenvutils\telnetserver\group" mrp="mw\appsupport\openenvutils\telnetserver\group\oetools_telnetd.mrp"/>
+          </component>
+        </collection>
 				<collection name="Hardware Resource Adaptation">
 					<component name="Hardware Resource Manager UI Plugin" introduced="tb91">
 						<unit bldFile="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group" mrp="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group\telephony_hwrmuiplugin.mrp"/>
@@ -1614,6 +1699,9 @@
           <component name="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
             <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group\mm-protocols_SIPSCPR.mrp"/>
           </component>
+          <component name="SIP Connection Plugins" plugin="Y" introduced="9.5" filter="gt,!tb91sf">
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipconnectionplugins\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipconnectionplugins\group\mm-protocols_sipproviders.mrp"/>
+          </component>
         </collection>
       </block>
       <block name="System GUI Framework" levels="structure presentation">
@@ -1675,13 +1763,19 @@
       <block name="PIM" levels="utilities engines">
         <collection name="PIM App Services" level="engines">
           <component name="Calendar" introduced="9.5">
+            <unit version="1" bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calinterimapi.mrp" filter="!tb91sf"/>
             <unit version="2" bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp"/>
           </component>
+          <component name="Agenda Model" introduced="5.0" deprecated="9.1" filter="!tb91sf">
+            <unit bldFile="app\organizer\pimappservices\agnmodel\group" mrp="app\organizer\pimappservices\agnmodel\group\app-engines_agnmodel.mrp"/>
+          </component>
           <component name="Agenda Versit Plugin" plugin="Y" introduced="9.5">
+            <unit version="1" bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit.mrp" filter="!tb91sf"/>
             <unit version="2" bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp"/>
           </component>
           <component name="Contacts Model" introduced="5.0">
             <unit version="1" bldFile="app\contacts\phonebookengines\contactsmodel\group" mrp="app\contacts\phonebookengines\contactsmodel\group\app-engines_cntmodel.mrp"/>
+            <unit version="2" bldFile="app\contacts\phonebookengines\contactsmodel\groupsql" mrp="app\contacts\phonebookengines\contactsmodel\groupsql\app-engines_cntmodel.mrp" filter="!tb91sf"/>
           </component>
           <component name="Phonebook Sync" plugin="Y">
             <unit bldFile="app\contacts\pimprotocols\phonebooksync\group" mrp="app\contacts\pimprotocols\phonebooksync\group\telephony_phbksync.mrp"/>
@@ -2019,6 +2113,7 @@
       </collection>
       <collection name="Shortlink Test" level="test">
          <component name="USB Manager Tests" introduced="7.0" class="test">
+          <unit version="1" mrp="os\unref\orphan\comgen\ser-comms\usb_test\group\ser-comms_usb_test.mrp" filter="!tb91sf"/>
           <unit version="2" mrp="os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp"/>
         </component>
         <component name="Bluetooth Examples and Tests" introduced="6.1" class="test">
@@ -2104,7 +2199,7 @@
   <!-- 9.4 configuration -->
     <!-- tb91 configuration -->
     <!-- tb91sf configuration -->
-  <configuration name="GT_tb91sf" description="tb91sf GT build" filter="raptor_tb91sf,gt">
+  <configuration name="GT_tb91sf" description="tb91sf GT build" filter="GT_tb91sf,gt">
     <ref item="Tools and Utils and SDKENG"/>
     <ref item="HAL"/>
     <ref item="Kernel Services"/>
diff -r 71d9345f5c38 -r 14550681ff31 clean/sysdefs/system_model_s60.xml
--- a/clean/sysdefs/system_model_s60.xml	Tue Jul 07 14:43:57 2009 +0100
+++ b/clean/sysdefs/system_model_s60.xml	Wed Jul 08 12:47:53 2009 +0100
@@ -362,6 +362,13 @@
 </component>
 </module>
 </logicalsubset>
+<logicalsubset name="rndtools">
+<module name="rndtools">
+<component name="rndtools">
+<unit unitID="sf_app_rndtools" name="rndtools" bldFile="\sf\app\rndtools\group" mrp=""/>
+</component>
+</module>
+</logicalsubset>
 <logicalsubset name="screensaver">
 <module name="screensaver">
 <component name="screensaver">
@@ -640,6 +647,13 @@
 </component>
 </module>
 </logicalsubset>
+<logicalsubset name="platformtools">
+<module name="platformtools">
+<component name="platformtools">
+<unit unitID="sf_mw_platformtools" name="platformtools" bldFile="\sf\mw\platformtools\group" mrp=""/>
+</component>
+</module>
+</logicalsubset>
 <logicalsubset name="remoteconn">
 <module name="remoteconn">
 <component name="remoteconn">
@@ -782,11 +796,6 @@
 <unit unitID="sf_os_deviceplatformrelease_S60Extras" name="S60Extras" bldFile="\sf\os\deviceplatformrelease\S60Extras\group" mrp=""/>
 </component>
 </module>
-<module name="S60Helps">
-<component name="S60Helps">
-<unit unitID="sf_os_deviceplatformrelease_S60Helps" name="S60Helps" bldFile="\sf\os\deviceplatformrelease\S60Helps\Group" mrp=""/>
-</component>
-</module>
 <module name="S60LocFiles">
 <component name="S60LocFiles">
 <unit unitID="sf_os_deviceplatformrelease_S60LocFiles" name="S60LocFiles" bldFile="\sf\os\deviceplatformrelease\S60LocFiles\group" mrp=""/>
@@ -843,6 +852,23 @@
 </component>
 </module>
 </logicalsubset>
+<logicalsubset name="osrndtools">
+<module name="osrndtools">
+<component name="osrndtools">
+<unit unitID="sf_os_osrndtools" name="osrndtools" bldFile="\sf\os\osrndtools\group" mrp=""/>
+</component>
+</module>
+<module name="hti">
+<component name="hti">
+<unit unitID="sf_os_osrndtools_hti" name="hti" bldFile="\sf\os\osrndtools\hti\group" mrp=""/>
+</component>
+</module>
+<module name="osrndtools_plat">
+<component name="hti_api">
+<unit unitID="sf_os_osrndtools_osrndtools_plat_hti_api" name="hti_api" bldFile="\sf\os\osrndtools\osrndtools_plat\hti_api\group" mrp=""/>
+</component>
+</module>
+</logicalsubset>
 <logicalsubset name="ossrv">
 <module name="ossrv">
 <component name="ossrv">
@@ -884,39 +910,12 @@
 </module>
 </logicalsubset>
 </logicalset>
-<logicalset name="ostools">
-<logicalsubset name="osrndtools">
-<module name="osrndtools">
-<component name="osrndtools">
-<unit unitID="sf_ostools_osrndtools" name="osrndtools" bldFile="\sf\ostools\osrndtools\group" mrp=""/>
-</component>
-</module>
-<module name="hti">
-<component name="hti">
-<unit unitID="sf_ostools_osrndtools_hti" name="hti" bldFile="\sf\ostools\osrndtools\hti\group" mrp=""/>
-</component>
-</module>
-<module name="osrndtools_plat">
-<component name="hti_api">
-<unit unitID="sf_ostools_osrndtools_osrndtools_plat_hti_api" name="hti_api" bldFile="\sf\ostools\osrndtools\osrndtools_plat\hti_api\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-</logicalset>
 <logicalset name="tools">
 <module name="buildplatforms">
 <component name="buildplatforms">
 <unit unitID="sf_tools_buildplatforms" name="buildplatforms" bldFile="\sf\tools\buildplatforms\group" mrp=""/>
 </component>
 </module>
-<logicalsubset name="platformtools">
-<module name="platformtools">
-<component name="platformtools">
-<unit unitID="sf_tools_platformtools" name="platformtools" bldFile="\sf\tools\platformtools\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
-
 <logicalsubset name="homescreentools">
 <module name="homescreentools">
 <component name="homescreentools">
@@ -924,19 +923,6 @@
 </component>
 </module>
 </logicalsubset>
-
-<logicalsubset name="rndtools">
-<module name="rndtools">
-<component name="rndtools">
-<unit unitID="sf_tools_rndtools" name="rndtools" bldFile="\sf\tools\rndtools\group" mrp=""/>
-</component>
-</module>
-<module name="htiui">
-<component name="htiui">
-<unit unitID="sf_tools_rndtools_htiui" name="htiui" bldFile="\sf\tools\rndtools\htiui\group" mrp=""/>
-</component>
-</module>
-</logicalsubset>
 <logicalsubset name="swconfigtools">
 <module name="swconfigtools">
 <component name="swconfigtools">
@@ -957,6 +943,8 @@
 </logicalsubset>
 </logicalset>
 </layer>
+<layer name="os_layer">
+</layer>
 <layer name="SF_SOS">
 <module name="sf_licenseetsystub">
 <component name="sf_licenseetsystub">
@@ -1001,7 +989,7 @@
     <targetList name="tools_rel" description="tools Release Targets" target="TOOLS_REL"/>
     <targetList name="cwtools" description="cwtools Targets" target="CWTOOLS"/>
     <targetList name="cwtools_rel" description="cwtools Release Targets" target="CWTOOLS_REL"/>
-		<configuration name="S60_5_1_sf" description="S60 5.1 clean build" filter="S60_5_0,raptor_S60_5_1_sf">
+		<configuration name="S60_5_1_sf" description="S60 5.1 clean build" filter="S60_5_1_sf">
     	<unitListRef unitList="S60_COMMON_OSEXTENSION"/>
       <unitListRef unitList="S60_COMMON"/>
       <unitListRef unitList="S60_SF_BUILD"/>
@@ -1034,9 +1022,7 @@
 <!--  OS Extension build configurations start  -->
     <unitList name="S60_COMMON_OSEXTENSION" description="S60 common OSExtension">
 				<unitRef unit="sf_os_cellularsrv_telephonyserverplugins_common_tsy"/>
-        <unitRef unit="sf_os_deviceplatformrelease_S60LocFiles"/>   			
         <unitRef unit="sf_os_deviceplatformrelease_S60Extras"/>   			
-        <unitRef unit="sf_os_deviceplatformrelease_S60Helps"/>
         <unitRef unit="sf_os_deviceplatformrelease_Version"/>
 				<unitRef unit="sf_os_devicesrv"/>
 				<unitRef unit="sf_os_graphics"/>
@@ -1047,7 +1033,7 @@
 				<unitRef unit="sf_os_mm_devsoundextensions_addeddevsoundcontrol"/>
 				<unitRef unit="sf_os_shortlinksrv"/>
 				<unitRef unit="sf_os_wlan"/>
-				<unitRef unit="sf_ostools_osrndtools"/>
+				<unitRef unit="sf_os_osrndtools"/>
 			</unitList>
     <unitList name="S60_COMMON" description="S60 common">
 				<unitRef unit="sf_mw_classicui"/>
@@ -1132,19 +1118,21 @@
 				<unitRef unit="sf_tools_buildplatforms"/>
 				<!--unitRef unit="sf_tools_build_s60"/>
 				<unitRef unit="sf_tools_makefile_templates"/-->
-				<unitRef unit="sf_tools_platformtools"/>
+				<unitRef unit="sf_mw_platformtools"/>
 				<!--unitRef unit="sf_tools_platsim"/-->
-				<unitRef unit="sf_tools_rndtools"/>
+				<unitRef unit="sf_app_rndtools"/>
 				<unitRef unit="sf_tools_swconfigtools"/>
 				<unitRef unit="sf_tools_themeinstaller"/>
+				<unitRef unit="ext_tools_toolsextensions"/>
+				<unitRef unit="sf_tools_homescreentools"/>
 				<unitRef unit="sf_app_commonemail"/>
 				<unitRef unit="sf_app_radio"/>
 				<unitRef unit="sf_app_printing"/>
 				<unitRef unit="sf_mw_hapticsservices"/>
 				<unitRef unit="sf_app_gallery"/>
-				<unitRef unit="ext_tools_toolsextensions"/>
     </unitList>
     <unitList name="S60_SF_BUILD" description="S60 SF build">
+    		<unitRef unit="sf_os_deviceplatformrelease_S60LocFiles"/>   			
 				<unitRef unit="sf_mw_mmmw_mmfw_helix_stub"/>
 				<unitRef unit="sf_mw_securitysrv_pkiutilities_Certificates"/>
 				<unitRef unit="sf_mw_vpnclient"/>
@@ -1155,8 +1143,8 @@
 				<unitRef unit="sf_os_cellularsrv_basebandabstraction"/>
 				<unitRef unit="sf_os_cellularsrv_cellularsrv_plat_primary_pdp_context_qos_parameter_setting_api"/>
 				<unitRef unit="sf_tools_rndtools_htiui"/>
-				<unitRef unit="sf_ostools_osrndtools_osrndtools_plat_hti_api"/>
-				<unitRef unit="sf_ostools_osrndtools_hti"/>
+				<unitRef unit="sf_os_osrndtools_osrndtools_plat_hti_api"/>
+				<unitRef unit="sf_os_osrndtools_hti"/>
 				<unitRef unit="sf_os_graphics_openvg_openvginterface_group_openvg11"/>
     </unitList>
     <unitList name="S60_COMMON_OSEXTENSION_STUBS" description="S60 common OSExtension">