# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1288877731 0
# Node ID 3e63b7f94b64a2a8abb2290b2cb01e9afdb01d37
# Parent  52c2f66d4186b848ee4f30b05097336081833ded
Cosmetic and minor build fixes to symbian3 pkgdefs

diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -4,11 +4,13 @@
   <collection id="camera_plat" name="Camera Apps Platform Interfaces">
    <component id="camcorder_ui_constants_api" name="Camcorder UI Constants API" class="api" filter="s60">
     <meta rel="Api" href="camera_plat/camcorder_ui_constants_api/camcorder_ui_constants_api.metaxml"/>
-    <unit bldFile="camera_plat/camcorder_ui_constants_api/group"/>
+    <unit bldFile="camera_plat/camcorder_ui_constants_api/group" filter="!test"/>
+    <unit bldFile="camera_plat/camcorder_ui_constants_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="active_palette_2_api" name="Active Palette 2 API" class="api" filter="s60">
     <meta rel="Api" href="camera_plat/active_palette_2_api/active_palette_2_api.metaxml"/>
-    <unit bldFile="camera_plat/active_palette_2_api/group"/>
+    <unit bldFile="camera_plat/active_palette_2_api/group" filter="!test"/>
+    <unit bldFile="camera_plat/active_palette_2_api/tsrc/group" filter="test,api_test"/>
    </component>
   </collection>
   <collection id="camerauis" name="Camera UIs">
@@ -20,12 +22,5 @@
     <unit bldFile="camerauis/cameraapp/help/group"/>
    </component>
   </collection>
-  <collection id="camera_info" name="Camera Apps Info">
-   <component id="camera_plat_test" filter="s60,test,api_test" name="Camera Apps Platform API Tests" purpose="development">
-    <!-- can only have one unit. #include from a single bld.inf? -->
-    <unit bldFile="camera_plat/camcorder_ui_constants_api/tsrc/group"/>
-    <unit bldFile="camera_plat/active_palette_2_api/tsrc/group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/app/devicecontrol/package_definition.xml
--- a/symbian3/app/devicecontrol/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/app/devicecontrol/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -2,29 +2,29 @@
 <SystemDefinition schema="3.0.0">
   <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
     <collection id="devicediagnostics" name="Device Diagnostics" level="app">
-      <component id="devdiagapp" filter="s60" name="Device Diagnostics App">
+      <component id="devdiagapp" filter="s60" name="Device Diagnostics App" deprecated="^3">
         <unit bldFile="devicediagnostics/devdiagapp/group"/>
       </component>
-      <component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin">
+      <component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin" deprecated="^3">
         <unit bldFile="devicediagnostics/devdiaggsplugin/group"/>
       </component>
-      <component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin">
+      <component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin" deprecated="^3">
         <unit bldFile="devicediagnostics/diagplugins/group"/>
       </component>
-      <component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin">
+      <component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin" deprecated="^3">
         <unit bldFile="devicediagnostics/diagsuites/group"/>
       </component>
-      <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
+      <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build" deprecated="^3">
       	<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
         <unit bldFile="devicediagnostics/group"/>
       </component>
     </collection>
     <collection id="omadm" name="OMA Device Management" level="oma">
-      <component id="omadmappui" filter="s60" name="OMA DM Application UI">
+      <component id="omadmappui" filter="s60" name="OMA DM Application UI" deprecated="^3">
         <unit bldFile="omadm/omadmappui/group"/>
       </component>
-      <component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin">
+      <component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin" deprecated="^3">
         <unit bldFile="omadm/omadmextensions/group"/>
       </component>
       <component id="dcmo" filter="s60" name="Device Capabilities Management Object" class="plugin" introduced="^3">
@@ -32,7 +32,7 @@
       </component>
     </collection>
     <collection id="pnpmobileservices" name="PnP Mobile Services" level="mid">
-      <component id="pnpms" filter="s60" name="PnP MS">
+      <component id="pnpms" filter="s60" name="PnP MS" deprecated="^3">
         <unit bldFile="pnpmobileservices/pnpms/group"/>
       </component>
     </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -72,7 +72,7 @@
    </component>
   </collection>
   <collection id="taskswitcher" name="Task Switcher" level="support">
-   <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
+   <component id="hs_contextengine" filter="s60" name="Context Engine" introduced="^3">
     <unit bldFile="taskswitcher/contextengine/group"/>
    </component>
    <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/app/location/package_definition.xml
--- a/symbian3/app/location/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/app/location/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="location" name="Location Apps" levels="ui events loc apps">
-  <collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
-  </collection>
   <collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
    <component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
     <meta rel="Api" href="loc_pub/landmarks_ui_selector_api/landmarks_ui_selector_api.metaxml"/>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/app/techview/package_definition.xml
--- a/symbian3/app/techview/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/app/techview/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -34,7 +34,7 @@
         <unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
       </component>
     </collection>
-    <collection id="controlpanel" name="Control Panel" level="ui">
+    <collection id="tv_controlpanel" name="Control Panel" level="ui">
       <component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
         <unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
       </component>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/btservices/package_definition.xml
--- a/symbian3/mw/btservices/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/btservices/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -26,15 +26,18 @@
    </component>
    <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
@@ -42,7 +45,8 @@
    </component>
    <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
@@ -73,7 +77,8 @@
     <unit bldFile="bluetoothengine/btnotif/group"/>
    </component>
    <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
-    <unit bldFile="bluetoothengine/btaudioman/group"/>
+    <unit bldFile="bluetoothengine/btaudioman/group" filter="!test"/>
+    <unit bldFiile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
    </component>
    <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
     <unit bldFile="bluetoothengine/btmac/group"/>
@@ -82,7 +87,8 @@
     <unit bldFile="bluetoothengine/btsac/group"/>
    </component>
    <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
-    <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+    <unit bldFile="bluetoothengine/btaudiostreamer/group" filter="!test"/>
+    <unit bldFiile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
    </component>
    <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
     <unit bldFile="bluetoothengine/btsap/group"/>
@@ -117,9 +123,6 @@
    <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
     <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
    </component>
-   <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
-    <unit bldFiile="tsrc/group"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/imsrv/package_definition.xml
--- a/symbian3/mw/imsrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -102,7 +102,7 @@
     <meta rel="Api" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
     <unit bldFile="imsrv_plat/im_cache_server_api/group"/>
    </component>
-   <component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
+   <component id="presence_avabilitytext" name="Presence Availability Text" class="api" filter="s60">
     <unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
    </component>
   </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/ipappsrv/package_definition.xml
--- a/symbian3/mw/ipappsrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -64,9 +64,6 @@
     <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
     <unit mrp="group"/>
    </component>
-   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/ipconnmgmt/package_definition.xml
--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server generic utils">
-  <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="utils">
+ <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server utils api">
+  <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
    <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
     <meta rel="Api" href="ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml"/>
     <unit bldFile="ipcm_plat/access_point_engine_misc_api/group"/>
@@ -50,7 +50,7 @@
     <unit bldFile="ipcm_plat/mpm_connect_screen_api/group"/>
    </component>
   </collection>
-  <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="utils">
+  <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
    <component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
     <meta rel="Api" href="ipcm_pub/connection_settings_api/connection_settings_api.metaxml"/>
     <unit bldFile="ipcm_pub/connection_settings_api/group"/>
@@ -167,7 +167,7 @@
     <unit bldFile="dbcreator/group"/>
    </component>
   </collection>
-  <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
+  <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
    <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
     <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
     <unit bldFile="group"/>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/legacypresence/package_definition.xml
--- a/symbian3/mw/legacypresence/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/legacypresence/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -60,12 +60,6 @@
     <unit bldFile="xdmengine/group"/>
    </component>
   </collection>
-  <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-   <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-    <unit bldFile="xdmsettingsui/group"/>
-   </component>
-  </collection>
   <collection id="xdmprotocols" name="XDM Protocols" level="fw">
    <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
    <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
@@ -78,12 +72,6 @@
     <unit bldFile="msgconnmanager/group"/>
    </component>
   </collection>
-  <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-    <unit bldFile="presencesettingsui/group"/>
-   </component>
-  </collection>
   <collection id="simpleengine" name="SIMPLE Engine" level="engine">
    <!-- collection is really a component. Need to move down a directory-->
    <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/messagingmw/package_definition.xml
--- a/symbian3/mw/messagingmw/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -29,7 +29,7 @@
     <unit bldFile="msgfw_plat/send_ui_datautils_api/group"/>
    </component>
   </collection>
-  <collection id="msgbranched" name="Messaging Branched" level="fw">
+  <collection id="msgbranched" name="Messaging Branched" level="support">
    <!-- collection is really a component. Need to move down a directory -->
    <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
     <unit bldFile="msgbranched/group"/>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/metadatasrv/package_definition.xml
--- a/symbian3/mw/metadatasrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -2,45 +2,16 @@
 <SystemDefinition schema="3.0.0">
  <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
   <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
-   <component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
-   </component>
    <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
     <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
     <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
    </component>
-   <component id="metadatasrv_pub_build" name="Legacy Metadata Services Public Interface Build" class="api" filter="s60">
-	<!-- only needed for #ifdefs, remove when confguration is in use -->
-    <unit bldFile="metadatasrv_pub/group"/>
-   </component>
   </collection>
   <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
    <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
     <meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
     <unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
    </component>
-   <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
-   </component>
-   <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
-   </component>
-   <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
-	<!-- only needed for #ifdefs, remove when confguration is in use -->
-    <unit bldFile="metadatasrv_plat/group"/>
-   </component>
   </collection>
   <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
    <component id="mediafetch" filter="s60" name="Media Fetch">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/mmuifw/package_definition.xml
--- a/symbian3/mw/mmuifw/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -2,128 +2,128 @@
 <SystemDefinition schema="3.0.0">
  <package id="mmuifw" name="Multimedia UI Framework" levels="mgr mdl util ui api">
   <collection id="mmuifw_plat" name="Multimedia UI Framework Platform Interfaces" level="api">
-   <component id="alf_widgetfactory_api" name="ALF Widget Factory API" class="api" filter="s60">
+   <component id="alf_widgetfactory_api" name="ALF Widget Factory API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_widgetfactory_api/alf_widgetfactory_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_widgetfactory_api/group"/>
    </component>
-   <component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60">
+   <component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_widgetutils_api/alf_widgetutils_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_widgetutils_api/group"/>
    </component>
-   <component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60">
+   <component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_widgetmodel_api/alf_widgetmodel_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_widgetmodel_api/group"/>
    </component>
-   <component id="osn_container_api" name="OSN Container API" class="api" filter="s60">
+   <component id="osn_container_api" name="OSN Container API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/osn_container_api/osn_container_api.metaxml"/>
     <unit bldFile="mmuifw_plat/osn_container_api/group"/>
    </component>
-   <component id="osn_global_api" name="OSN Global API" class="api" filter="s60">
+   <component id="osn_global_api" name="OSN Global API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/osn_global_api/osn_global_api.metaxml"/>
     <unit bldFile="mmuifw_plat/osn_global_api/group"/>
    </component>
-   <component id="osn_string_api" name="OSN String API" class="api" filter="s60">
+   <component id="osn_string_api" name="OSN String API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/osn_string_api/osn_string_api.metaxml"/>
     <unit bldFile="mmuifw_plat/osn_string_api/group"/>
    </component>
-   <component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60">
+   <component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_resourcepool_api/alf_resourcepool_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_resourcepool_api/group"/>
    </component>
-   <component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60">
+   <component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_containerwidget_api/alf_containerwidget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_containerwidget_api/group"/>
    </component>
-   <component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60">
+   <component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_viewwidget_api/alf_viewwidget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_viewwidget_api/group"/>
    </component>
-   <component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60">
+   <component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_scrollbarwidget_api/alf_scrollbarwidget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_scrollbarwidget_api/group"/>
    </component>
-   <component id="alf_customlayoutmanagers_api" name="ALF Custom Layout Managers API" class="api" filter="s60">
+   <component id="alf_customlayoutmanagers_api" name="ALF Custom Layout Managers API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/alf_customlayoutmanagers_api/alf_customlayoutmanagers_api.metaxml"/>
     <unit bldFile="mmuifw_plat/alf_customlayoutmanagers_api/group"/>
    </component>
-   <component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60">
+   <component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/gesturehelper_api/gesturehelper_api.metaxml"/>
     <unit bldFile="mmuifw_plat/gesturehelper_api/group"/>
    </component>
-   <component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60">
+   <component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/mul_coverflowwidget_api/mul_coverflowwidget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/mul_coverflowwidget_api/group"/>
    </component>
-   <component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60">
+   <component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/mul_datamodel_api/mul_datamodel_api.metaxml"/>
     <unit bldFile="mmuifw_plat/mul_datamodel_api/group"/>
    </component>
-   <component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60">
+   <component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/mul_sliderwidget_api/mul_sliderwidget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/mul_sliderwidget_api/group"/>
    </component>
-   <component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60">
+   <component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60" deprecated="^3">
     <meta rel="Api" href="mmuifw_plat/mul_widget_api/mul_widget_api.metaxml"/>
     <unit bldFile="mmuifw_plat/mul_widget_api/group"/>
    </component>
   </collection>
   <collection id="mmuifw_info" name="Multimedia UI Framework Info" level="ui">
-   <component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
+   <component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build" deprecated="^3">
     <!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
     <unit bldFile="group"/>
    </component>
   </collection>
   <collection id="osncore" name="OS Neutral Library Core" level="util">
    <!-- collection is really a component. Move down a directory -->
-   <component id="osncore_build" filter="s60" name="OSN Core Build">
+   <component id="osncore_build" filter="s60" name="OSN Core Build" deprecated="^3">
     <unit bldFile="osncore/group"/>
    </component>
   </collection>
   <collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
    <!-- collection is really a component. Move down a directory -->
-   <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
+   <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils" deprecated="^3">
     <unit bldFile="alfwidgetutils/group"/>
    </component>
   </collection>
   <collection id="resourcepool" name="Resource Pool" level="util">
    <!-- collection is really a component. Move down a directory -->
-   <component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
+   <component id="alfresourcepool" filter="s60" name="ALF Resource Pool" deprecated="^3">
     <unit bldFile="resourcepool/group"/>
    </component>
   </collection>
   <collection id="widgetmodel" name="Widget Model" level="mdl">
    <!-- collection is really a component. Move down a directory -->
-   <component id="widgetmodel_build" filter="s60" name="Widget Model Build">
+   <component id="widgetmodel_build" filter="s60" name="Widget Model Build" deprecated="^3">
     <unit bldFile="widgetmodel/group"/>
    </component>
   </collection>
   <collection id="mulwidgets" name="MUL Widgets" level="ui">
    <!-- should spell out MUL in the collection name -->
-   <component id="mullogging" filter="s60" name="MUL Logging">
+   <component id="mullogging" filter="s60" name="MUL Logging" deprecated="^3">
     <unit bldFile="mulwidgets/mullogging/group"/>
    </component>
-   <component id="muldatamodel" filter="s60" name="MUL Data Model">
+   <component id="muldatamodel" filter="s60" name="MUL Data Model" deprecated="^3">
     <unit bldFile="mulwidgets/muldatamodel/group"/>
    </component>
-   <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
+   <component id="mulwidgets_common" filter="s60" name="MUL Common Utils" deprecated="^3">
     <unit bldFile="mulwidgets/common/group"/>
    </component>
-   <component id="gesturehelper" filter="s60" name="Gesture Helper">
+   <component id="gesturehelper" filter="s60" name="Gesture Helper" deprecated="^3">
     <unit bldFile="mulwidgets/gesturehelper/group"/>
    </component>
-   <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
+   <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget" deprecated="^3">
     <unit bldFile="mulwidgets/mulcoverflowwidget/group"/>
    </component>
-   <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
+   <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget" deprecated="^3">
     <unit bldFile="mulwidgets/mulsliderwidget/group"/>
    </component>
-   <component id="alfviewwidget" filter="s60" name="ALF View Widget">
+   <component id="alfviewwidget" filter="s60" name="ALF View Widget" deprecated="^3">
     <unit bldFile="mulwidgets/alfviewwidget/group"/>
    </component>
-   <component id="alfcontainerwidget" filter="s60" name="ALF Container Widget">
+   <component id="alfcontainerwidget" filter="s60" name="ALF Container Widget" deprecated="^3">
     <unit bldFile="mulwidgets/alfcontainerwidget/group"/>
    </component>
-   <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
+   <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget" deprecated="^3">
     <unit bldFile="mulwidgets/alfscrollbarwidget/group"/>
    </component>
   </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/srvdiscovery/package_definition.xml
--- a/symbian3/mw/srvdiscovery/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -2,43 +2,43 @@
 <SystemDefinition schema="3.0.0">
  <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
   <collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
-   <component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
    </component>
   </collection>
   <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-   <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
     <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
    </component>
   </collection>
   <collection id="upnp" name="UPnP" level="server">
-   <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
     <unit bldFile="upnp/upnpstack/group"/>
    </component>
   </collection>
   <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-   <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop" filter="s60">
     <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
    </component>
   </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/uitools/package_definition.xml
--- a/symbian3/mw/uitools/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/uitools/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -8,11 +8,11 @@
    </component>
   </collection>
   <collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
-   <component id="cdl_api" name="CDL API" class="api" filter="s60">
+   <component id="uitools_cdl_api" name="CDL API" class="api" filter="s60">
     <meta rel="Api" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
     <unit bldFile="uitools_plat/cdl_api/group"/>
    </component>
-   <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+   <component id="uitools_layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
     <meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
     <unit bldFile="uitools_plat/layout_system_private_api/group"/>
    </component>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/videoutils/package_definition.xml
--- a/symbian3/mw/videoutils/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -4,11 +4,19 @@
   <collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
    <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
     <meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
-    <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
+      <meta rel="testbuild">
+       <group name="videoscheduler_api_tsrc"/>
+      </meta>
+      <unit bldFile="videoutils_plat/videoscheduler_api/group" filter="!test"/>
+      <unit bldFile="videoutils_plat/videoscheduler_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+      <meta rel="testbuild">
+       <group name="videoconnutility_apitsrc"/>
+      </meta>
     <meta rel="Api" href="videoutils_plat/videoconnutility_api/videoconnutility_api.metaxml"/>
-    <unit bldFile="videoutils_plat/videoconnutility_api/group"/>
+      <unit bldFile="videoutils_plat/videoconnutility_api/group" filter="!test"/>
+      <unit bldFile="videoutils_plat/videoconnutility_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
     <meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/mw/vpnclient/package_definition.xml
--- a/symbian3/mw/vpnclient/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -9,7 +9,7 @@
       </component>
   </collection>
   <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-   <component id="vpnapi" filter="s60" name="VPN API">
+   <component id="vpnapi_impl" filter="s60" name="VPN API">
     <unit bldFile="vpnapiimpl/group" filter="!oem_build"/>
    </component>
   </collection>
@@ -109,7 +109,7 @@
    <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
     <unit bldFile="vpnui/vpndialogmanager/group" filter="!oem_build"/>
    </component>
-   <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
+   <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin" deprecated="^3">
     <unit bldFile="vpnui/vpnmanagementui/group" filter="!oem_build"/>
    </component>
    <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -101,7 +101,7 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^3">
     <layer id="adapt" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" href="../../../../adapt/stubs/package_definition.xml"/>
+      <package id="stubs" tech-domain="hb" level="high" span="2" href="../../../../adapt/stubs/package_definition.xml"/>
       <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adapt/beagleboard/package_definition.xml"/>
       <package id="qemu" tech-domain="hb" level="low" href="../../../../adapt/qemu/package_definition.xml"/>
       <package id="naviengine.nec" tech-domain="hb" level="low" href="../../../../adapt/naviengine.nec/package_definition.xml"/>
@@ -180,7 +180,6 @@
       <package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition.xml"/>
       <package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition.xml"/>
       <package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition.xml"/>
-      <!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
     </layer>
     <layer id="app" name="Applications" levels="services apps">
       <package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition.xml"/>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/imagingext/package_definition.xml
--- a/symbian3/os/imagingext/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -34,7 +34,7 @@
     <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
     <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
    </component>
-   <component id="ecam_use_case_hint_custom_api" name="ECam Use Case Hint Custom API" class="api" filter="s60">
+   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^3">
     <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
     <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
    </component>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -17,8 +17,8 @@
       <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
       </component>
-      <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
-        <unit bldFile="datasourcemodules/locationapesuplpsy/group"/>
+      <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
       </component>
     </collection>
     <collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -4,15 +4,18 @@
   <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
    <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_api/group"/>
+    <unit bldFile="mm_pub/audio_effects_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/audio_effects_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
-    <unit bldFile="mm_pub/audio_effects_presets_api/group"/>
+    <unit bldFile="mm_pub/audio_effects_presets_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/audio_effects_presets_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
-    <unit bldFile="mm_pub/drm_audio_player_api/group"/>
+    <unit bldFile="mm_pub/drm_audio_player_api/group" filter="!test"/>
+    <unit bldFile="mm_pub/drm_audio_player_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
@@ -22,7 +25,8 @@
   <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
    <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/aac_decoder_config_api/group"/>
+    <unit bldFile="mm_plat/aac_decoder_config_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/aac_decoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
@@ -58,7 +62,8 @@
    </component>
    <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
-    <unit bldFile="mm_plat/audio_routing_api/group"/>
+    <unit bldFile="mm_plat/audio_routing_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/audio_routing_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
@@ -94,7 +99,8 @@
    </component>
    <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/eaac_plus_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -106,7 +112,8 @@
    </component>
    <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/error_concealment_interface_api/group"/>
+    <unit bldFile="mm_plat/error_concealment_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/error_concealment_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
@@ -122,7 +129,8 @@
    </component>
    <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g711_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -134,7 +142,8 @@
    </component>
    <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g711_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g711_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -146,7 +155,8 @@
    </component>
    <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g729_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -158,7 +168,8 @@
    </component>
    <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/g729_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/g729_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
@@ -170,7 +181,8 @@
    </component>
    <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
-    <unit bldFile="mm_plat/global_audio_settings_api/group"/>
+    <unit bldFile="mm_plat/global_audio_settings_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/global_audio_settings_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
@@ -178,7 +190,8 @@
    </component>
    <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ilbc_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -190,7 +203,8 @@
    </component>
    <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ilbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -218,7 +232,8 @@
    </component>
    <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/ra8_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/ra8_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -234,7 +249,8 @@
    </component>
    <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
-    <unit bldFile="mm_plat/restricted_audio_output_api/group"/>
+    <unit bldFile="mm_plat/restricted_audio_output_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/restricted_audio_output_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
@@ -246,7 +262,8 @@
    </component>
    <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/sbc_encoder_interface_api/group"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/sbc_encoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
@@ -262,7 +279,8 @@
    </component>
    <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
-    <unit bldFile="mm_plat/speech_encoder_config_api/group"/>
+    <unit bldFile="mm_plat/speech_encoder_config_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/speech_encoder_config_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
@@ -302,7 +320,8 @@
    </component>
    <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
-    <unit bldFile="mm_plat/wma_decoder_interface_api/group"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_api/group" filter="!test"/>
+    <unit bldFile="mm_plat/wma_decoder_interface_api/tsrc/group" filter="s60,test,api_test,pref_test"/>
    </component>
    <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
     <meta rel="Api" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
@@ -421,9 +440,6 @@
    <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
     <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
    </component>
-   <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
-    <unit bldFile="tsrc/group"/>
-   </component>
    <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
    </component>
@@ -502,7 +518,7 @@
    <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
     <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
    </component>
-   <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+   <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin" deprecated="^4">
     <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
    </component>
    <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/networkingsrv/package_definition.xml
--- a/symbian3/os/networkingsrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -63,7 +63,7 @@
       </component>
     </collection>
     <collection id="networkcontrol" name="Network Control" level="plugin">
-      <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test">
+      <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test" deprecated="^4">
         <unit mrp="networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="networkcontrol/qosfwconfig/qos/data"/>
       </component>
       <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
@@ -138,10 +138,10 @@
       <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
         <unit mrp="networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="networkingtestandutils/ipanalyzer/group"/>
       </component>
-      <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+      <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development" filter="test">
         <unit bldFile="networkingtestandutils/networkingintegrationtest/Group" mrp="networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
       </component>
-      <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+      <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development" filter="test">
         <unit bldFile="networkingtestandutils/networkingperformancemeasurementtools/group" mrp="networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
       </component>
     </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/osrndtools/package_definition.xml
--- a/symbian3/os/osrndtools/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
+ <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace analysis">
   <collection id="stif" name="STIF" level="fw">
     <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
       <unit bldFile="stif/stif_plat/group"/>
@@ -53,24 +53,24 @@
     <unit bldFile="stif/group"/>
    </component>
   </collection>
-  <collection id="memspy" name="Memspy" level="trace">
-    <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+  <collection id="memspy" name="MemSpy" level="trace">
+    <component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
     <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
       <unit bldFile="memspy/memspy_plat/group"/>
     </component>
-   <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+   <component id="driver" filter="s60" name="MemSpy Driver" purpose="development">
     <unit bldFile="memspy/driver/group"/>
    </component>
-   <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+   <component id="memspy_engine" filter="s60" name="MemSpy Engine" purpose="development">
     <unit bldFile="memspy/engine/group"/>
    </component>
-   <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+   <component id="commandline" filter="s60" name="MemSpy Command Line" purpose="development">
     <unit bldFile="memspy/commandline/group"/>
    </component>
-   <component id="console" filter="s60" name="Memspy Console" purpose="development">
+   <component id="console" filter="s60" name="MemSpy Console" purpose="development">
     <unit bldFile="memspy/console/group"/>
    </component>
-   <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+   <component id="memspy_build" filter="s60" name="MemSpy Build" purpose="development">
     <!--  move exports into self-contained component.-->
     <unit bldFile="memspy/group"/>
    </component>
@@ -115,10 +115,5 @@
     <unit bldFile="hti/group"/>
    </component>
   </collection>
-  <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
-   <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/ossrv/package_definition.xml
--- a/symbian3/os/ossrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -353,7 +353,7 @@
    <component id="dbus_api" name="Dbus API" class="api" filter="s60">
     <unit bldFile="ossrv_pub/dbus/group"/>
    </component>
-   <component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+   <component id="dbus_glib_api" name="D-Bus GLib API" class="api" filter="s60">
     <unit bldFile="ossrv_pub/dbus-glib/group"/>
    </component>
   </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/persistentdata/package_definition.xml
--- a/symbian3/os/persistentdata/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/persistentdata/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -13,7 +13,7 @@
       <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
         <unit bldFile="loggingservices/eventlogger/group" mrp="loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
       </component>
-      <component id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+      <component id="filelogger" name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
         <unit bldFile="loggingservices/filelogger/group" mrp="loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
       </component>
       <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/security/package_definition.xml
--- a/symbian3/os/security/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/security/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -16,10 +16,12 @@
       <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
         <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
       </component>
-      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development" filter="test">
-		<!-- remove test filter once cafstreamingsupport is available -->
+      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">      
         <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
       </component>
+      <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
+        <unit bldFile="contentmgmt/cafstreamingsupport/group" mrp="contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
+      </component>      
     </collection>
     <collection id="crypto" name="Crypto Libraries" level="libraries">
       <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/usb/package_definition.xml
--- a/symbian3/os/usb/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adapt hw-if plugin framework server app-if">
+  <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
+	<!-- placeholder for platform APIs -->
+  </collection>
   <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
    <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
   </collection>
diff -r 52c2f66d4186 -r 3e63b7f94b64 symbian3/os/wlan/package_definition.xml
--- a/symbian3/os/wlan/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -95,10 +95,5 @@
     <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
    </component>
   </collection>
-  <collection id="wlan_info" name="WLAN Info" level="test">
-   <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>