# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1279036062 -3600
# Node ID 633f3bea9521e2946eac89f76caf46fd9a462452
# Parent  18ee574c682a4e97519cdfd597021079328ce1c0
Update all pkgdef files

diff -r 18ee574c682a -r 633f3bea9521 symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -9,11 +9,6 @@
       <unit bldFile="audiostubs/fmradiotunercontrolstub/group"/>
      </component>
     </collection>
-   <collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
-     <component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-      <unit bldFile="btaudioadaptation_stub/group"/>
-     </component>
-    </collection>
    <collection id="drm_stubs" name="DRM Stubs" level="plugin">
      <component id="drm_stubs_build" name="DRM Stubs Build">
       <unit bldFile="drm_stubs/group"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -4,7 +4,16 @@
    <!-- need to resolve the qt parts into proper components, then uncomment the units -->
   <collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
    <component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
-    <!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
+    <!--<unit bldFile="email_plat/nmail_client_api" qt:proFile="nmail_client_api.pro"/> -->
+   </component>
+   <component id="email_services_api" name="Email Services API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/email_services_api" qt:proFile="email_services_api.pro"/> -->
+   </component>
+   <component id="nmail_settings_api" name="NMail Settings API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/nmail_settings_api" qt:proFile="nmail_settings_api.pro"/> -->
+   </component>
+   <component id="email_client_api" name="EMail Client API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/email_client_api" qt:proFile="email_client_api.pro"/> -->
    </component>
   </collection>
     <collection id="emailservices" name="Email Services" level="service">
@@ -78,7 +87,7 @@
     <collection id="commonemail_info" name="Email Apps Info" level="app">
     <component id="commonemail_build" name="Email Apps Build"  introduced="^4">
 		<!-- split into actual components -->
-      <unit bldFile="group"/>
+      <unit bldFile="."  qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
     </component>
     </collection>
   </package>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="contacts" name="Contacts Apps" levels="engine support services ui">
+ <package id="contacts" name="Contacts Apps" levels="engine support services plugin ui">
   <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
    <component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
     <meta rel="Api" href="contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml"/>
@@ -25,19 +25,21 @@
     <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
    </component>
   </collection>
+  <collection id="phonebookengines_old" name="Old Phonebook Engines" level="engine">
+   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+        <unit version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+   </component>
+  </collection>
   <collection id="phonebookengines" name="Phonebook Engines" level="engine">
    <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
     <unit bldFile="phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
    </component>
-   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
-        <unit version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
-   </component>
    <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
     <unit bldFile="phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
    </component>
    <component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
 	<!-- need to move to this actual dir rather than including something from another collection -->
-    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+    <!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
    </component>
    <component id="cntlistmodel" filter="s60" name="Contact List Model" introduced="^4">
     <unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/>
@@ -71,6 +73,12 @@
     <unit bldFile="presencecache/presencecacheqt" qt:proFile="presencecacheqt.pro"/>
    </component>
   </collection>
+  <collection id="contactwidgethsplugin" name="Contact Widget Homescreen Plugin" level="plugin">
+	<!-- collection is really a component, move down a directory -->
+   <component id="contactwidgethsplugin_build" name="Contact Widget Homescreen Plugin Build" introduced="^4">
+      <unit bldFile="contactwidgethsplugin" qt:proFile="contactwidgethsplugin.pro"/>
+   </component>
+  </collection>
   <collection id="contacts_info" name="Contacts Apps Info" level="ui">
    <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -7,6 +7,12 @@
         <unit bldFile="devicemgmtdialogsplugin" qt:proFile="devicemgmtdialogsplugin.pro"/>
       </component>
     </collection>
+    <collection id="devicemgmtindicatorsplugin" name="Device Management Indicators Plugin" level="support">
+		<!-- collection is really a component. Need to move down a dir -->
+      <component id="devicemgmtindicatorsplugin_build" name="Device Management Indicators Plugin Build" filter="s60" introduced="^4" class="plugin">
+        <unit bldFile="devicemgmtindicatorsplugin" qt:proFile="devicemgmtindicatorsplugin.pro"/>
+      </component>
+    </collection>
     <collection id="deviceupdatesui" name="Device Updates UI" level="app">
       <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
         <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
@@ -23,6 +29,15 @@
         <unit bldFile="clientprovisioning/cpqtsp" qt:proFile="cpqtsp.pro"/>
       </component>
     </collection>
+    <collection id="applicationmanagement" name="Applicaton Management" level="mid">
+      <component id="applicationmgmtserver" name="Applicaton Management Server" filter="s60" introduced="^4">
+        <unit bldFile="applicationmanagement/server" qt:proFile="server.pro"/>
+      </component>
+      <component id="applicationmgmt_build" name="Applicaton Management Build" filter="s60" introduced="^4">
+		<!-- need to break up into components or move down a directory -->
+        <unit bldFile="applicationmanagement/group"/>
+      </component>
+    </collection>
     <collection id="omadmadapters" name="OMA DM Adapters" level="support">
       <component id="omadmadapters_build" name="OMA DM Adapters Build" filter="s60">
         <!-- need to split IBY into the components or make this a ROM component -->
@@ -50,7 +65,7 @@
         <unit bldFile="omadmadapters/globalwlansettings/group"/>
       </component>
       <component id="nsmldminternet" name="nsmldminternet" filter="s60">
-        <!--  <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+		<unit bldFile="omadmadapters/nsmldminternet/group"/>
       </component>
       <component id="nsmldmalwaysonadapter" name="Always Online Device Management Adapter" filter="s60" introduced="9.1" class="plugin">
         <unit bldFile="omadmadapters/nsmldmalwaysonadapter/group"/>
@@ -83,7 +98,7 @@
         <meta rel="config">
           <defined condition="__SYNCML_DM_FOTA"/>
         </meta>
-        <!--  <unit bldFile="omadmadapters/fota/bld"/> -->
+		<unit bldFile="omadmadapters/fota/bld"/>
       </component>
       <component id="omadm_imps" name="OMA DM IMPS" filter="s60">
         <meta rel="config">
@@ -92,7 +107,19 @@
         <!--  <unit bldFile="omadmadapters/imps/bld"/> -->
       </component>
       <component id="dcmodmadapter" name="DC Management Object  DM Adapter" filter="s60" class="plugin">
-        <!--  <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
+		<unit bldFile="omadmadapters/dcmodmadapter/group"/>
+      </component>
+    </collection>
+    <collection id="omadcmoadapters" name="OMA DC Management Object Adapters" level="support">
+      <component id="omadcmoadapters_build" name="OMA DCMA Adapters Build" filter="s60" introduced="^4">
+		<!-- need to break up into components  -->
+        <unit bldFile="omadcmoadapters/group"/>
+      </component>
+    </collection>
+    <collection id="omacpadapters" name="OMA Client Provisioning Adapters" level="support">
+      <component id="omacpadapters_build" name="OMA CP Adapters Build" filter="s60" introduced="^4">
+		<!-- need to break up into components  -->
+        <unit bldFile="omacpadapters/bld"/>
       </component>
     </collection>
   </package>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -41,12 +41,11 @@
       <unit bldFile="homescreenapp"  qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
      </component>
     </collection>
-  <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
-	<!-- break collection info components, or move down a dir and make it a component -->
-    <component id="taskswitcherapp_build" name="Task Switcher Application Build">
-      <unit bldFile="taskswitcherapp"  qt:proFile="taskswitcherapp.pro" qt:qmakeArgs="-r -config rom"/>
+  <collection id="screensaver" name="Screen Saver" level="ss">
+	<!-- break collection into components, or move down a dir and make it a component -->
+    <component id="screensaver_build" name="Screen Saver Build">
+      <unit bldFile="screensaver"  qt:proFile="screensaver.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
-	<component id="tsdevicedialogplugin" name="Task Switcher Device Dialog Plugin" introduced="^4" class="plugin"/>
     </collection>
  </package>
 </SystemDefinition>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -125,8 +125,8 @@
    <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
     <unit bldFile="phoneplugins/csplugin/group"/>
    </component>
-   <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
-    <unit bldFile="phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+   <component id="dialerwidgetplugin" filter="s60" name="Dialer Widget Plugin" class="plugin" introduced="^4">
+    <unit bldFile="phoneplugins/dialerwidgetplugin" qt:proFile="dialerwidgetplugin.pro"/>
    </component>
    <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
     <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -43,7 +43,10 @@
       </component>
     </collection>
     <collection id="stifui" name="STIF UI" level="generic">
-      <component id="stifuiqt" filter="s60" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
+      <component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
+        <unit bldFile="stifui/avkon/group"/>
+      </component>
+      <component id="stifuiqt" filter="s60,test" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
 		<unit bldFile="stifui/qt" qt:proFile="stifqtui.pro" /> <!-- should use stifuiqt as the dir name -->
       </component>
     </collection>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/search/package_definition.xml
--- a/symbian4/app/search/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,11 +1,26 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="search" name="Search Apps" levels="eng base app api">
-	<collection id="search_info" name="Search Info"> 
+	<collection id="search_info" name="Search Info" level="base"> 
 	<component id="search_build" name="Search Build" introduced="^4">
 	  <unit bldFile="group"/>
 	 </component>
 	</collection>
-	<collection id="searchui" name="Search UI">
+	<collection id="search_plat" name="Search Platform Interfaces" level="api">
+	<component id="search_plat_build" name="Search Platform Interfaces Build" introduced="^4" class="api">
+	  <unit bldFile="search_plat" qt:proFile="search_plat.pro"/>
+	 </component>
+	</collection>
+	<collection id="onlinesearchproviders" name="Online Search Providers" level="eng">
+	<component id="onlinesearchproviders_build" name="Online Search Providers Build" introduced="^4">
+	  <unit bldFile="onlinesearchproviders" qt:proFile="onlinesearchproviders.pro"/>
+	 </component>
+	</collection>
+	<collection id="search_harvesterplugins" name="Search Harvester Plugins" level="base">
+	<component id="search_qtemailfetcher" name="Search Qt Email Fetcher" introduced="^4" class="plugin">
+	  <unit bldFile="harvesterplugins/messaging/email/qtemailfetcher" qt:proFile="qtemailfetcher.pro"/>
+	 </component>
+	</collection>
+	<collection id="searchui" name="Search UI" level="app">
 	<component id="searchui_build" name="Search UI Build" introduced="^4">
 	  <unit bldFile="searchui" qt:proFile="searchui.pro"/>
 	 </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -62,7 +62,7 @@
     <unit bldFile="mediasettings/mediasettingsengine/group"/>
    </component>
    <component id="videosettingsplugin" filter="s60" name="Video Settings Plugin" class="plugin">
-    <!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
+    <unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/>
    </component>
   </collection>
   <collection id="videoplayerapp" name="Video Player App" level="apps">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -10,14 +10,23 @@
     <meta rel="Api" href="accesssec_plat/eap_type_api/eap_type_api.metaxml"/>
     <unit bldFile="accesssec_plat/eap_type_api/group"/>
    </component>
+   <component id="eap_qt_configuration_api" name="EAP Qt Configuration API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="accesssec_plat" qt:proFile="accesssec_plat.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="securitysettings" name="WLAN Security Settings" level="specific">
    <component id="accesssec_qtconfigutils" filter="s60" name="Access Security Config Utils" introduced="^4">
     <unit bldFile="securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro" qt:qmakeArgs="-r"/>
    </component>
-   <component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" introduced="^4">
+   <component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" class="plugin" introduced="^4">
     <unit bldFile="securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro" qt:qmakeArgs="-r"/>
    </component>
+   <component id="cpeapuiplugins" filter="s60" name="Control Panel EAP UI Pugins" class="plugin"  introduced="^4">
+    <unit bldFile="securitysettings/cpeapuiplugins" qt:proFile="cpeapuiplugins.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="eapqtdialogs" filter="s60" name="EAP Qt Dialogs" introduced="^4">
+    <unit bldFile="securitysettings/eapqtdialogs" qt:proFile="eapqtdialogs.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="eapol" name="EAPOL" level="framework">
    <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -45,9 +45,8 @@
    </component>
   </collection>
     <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-    	<!-- collection is really just a component. Move down one diretcory -->
-      <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
-        <unit bldFile="ncdengine/group"/>
+      <component id="ncdengine_build" filter="s60" name="NCD Engine" introduced="^1">
+        <unit bldFile="ncdengine/engine"  qt:proFile="engine.pro" qt:qmakeArgs="-r"/>
       </component>
     </collection>
     <collection id="appinstaller" name="Application Installer" level="generic">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -236,9 +236,16 @@
    <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
     <unit bldFile="systemsettings/gssensorplugin/group"/>
    </component>
-   <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+   <component id="gsaccessoryplugin" filter="s60,test" name="GS Accessory Plugin" class="plugin"> <!-- don't build -->
     <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
    </component>
+   <component id="accindicatorplugin" filter="s60" name="ACC Indicator Plugin" class="plugin">
+    <unit bldFile="systemsettings/accindicatorplugin" qt:proFile="accindicatorplugin.pro"/>
+   </component>
+   <component id="accindicatorsettings" filter="s60" name="ACC Indicator Settings">
+	<!-- can't have a component inside another component -->
+    <unit bldFile="systemsettings/accindicatorplugin/accindicatorsettings" qt:proFile="accindicatorsettings.pro"/>
+   </component>
   </collection>
   <collection id="filehandling" name="File Handling" level="server">
    <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
@@ -267,7 +274,7 @@
     <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
    </component>
    <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
-    <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+        <unit mrp="commonappservices/doc_pub/app-services_documentation.mrp"/>
    </component>
    <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
     <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -27,17 +27,17 @@
    <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" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="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" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="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" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="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"/>
@@ -46,7 +46,7 @@
    <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" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="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"/>
@@ -83,6 +83,9 @@
    <component id="usb_obexservicemanager_client_api" name="OBEX Service Manager Client API" class="api" filter="s60">
     <unit bldFile="btservices_plat/usb_obexservicemanager_client_api/group"/>
    </component>
+   <component id="bt_remote_device_setting_api" name="BT Remote Device Setting API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="btservices_plat" qt:proFile="btservices_plat.pro"/>
+   </component>
   </collection>
   <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
    <component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
@@ -94,7 +97,7 @@
    </component>
    <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
     <unit bldFile="bluetoothengine/btserviceutil/group" filter="!test"/>
-    <unit bldFiile="bluetoothengine/btserviceutil/tsrc/btserviceutiltest/group"  filter="test,api_test"/>
+    <unit bldFile="bluetoothengine/btserviceutil/tsrc/btserviceutiltest/group"  filter="test,api_test"/>
    </component>
    <component id="btnotif" filter="s60" name="Bluetooth Notifier">
     <unit bldFile="bluetoothengine/btnotif/group"/>
@@ -104,7 +107,7 @@
    </component>
    <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
     <unit bldFile="bluetoothengine/btaudioman/group" filter="!test"/>
-    <unit bldFiile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
+    <unit bldFile="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"/>
@@ -114,7 +117,7 @@
    </component>
    <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
     <unit bldFile="bluetoothengine/btaudiostreamer/group" filter="!test"/>
-    <unit bldFiile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
+    <unit bldFile="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"/>
@@ -131,6 +134,12 @@
    <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
     <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
    </component>
+   <component id="btindicator" filter="s60" name="Bluetooth Indicator" introduced="^4">
+    <unit bldFile="bluetoothengine/btindicator" qt:proFile="btindicator.pro"/>
+   </component>
+   <component id="bluetoothengine_conf" filter="s60" name="Bluetooth Engine Config" class="config" introduced="^4">
+    <unit bldFile="bluetoothengine/conf"/>
+   </component>
   </collection>
   <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
    <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -154,6 +163,10 @@
      <component id="obexreceiveservices" name="OBEX Receive Services"  filter="s60">
       <unit bldFile="btobexprofiles/obexreceiveservices/group"/>
      </component>
+     <component id="btmsgviewer" name="BT Message Viewer"  filter="s60" introduced="^4">
+		<!-- should be moved out from under obexreceiveservices into own component dir -->
+        <unit bldFile="btobexprofiles/obexreceiveservices/btmsgviewer" qt:proFile="btmsgviewer.pro"/>
+     </component>
      <component id="obexsendservices" name="OBEX Send Services"  filter="s60">
       <unit bldFile="btobexprofiles/obexsendservices/group"/>
      </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -104,12 +104,19 @@
     <!-- should be split into the above files, or them collapsed into a single component -->
     <unit bldFile="commondrm/group"/>
    </component>
+   <component id="commondrm_qt_build" filter="s60" name="Common DRM Qt Build"  introduced="^4">
+   <!-- split up build components -->
+    <unit bldFile="commondrm"  qt:qmakeArgs="-r" qt:proFile="commondrm.pro"/>
+   </component>
   </collection>
   <collection id="omadrm" name="OMA DRM" level="server">
-   <!-- collection is really a component. Move down a directory -->
+   <!-- split up build components -->
    <component id="omadrm_build" filter="s60" name="OMA DRM Build">
     <unit bldFile="omadrm/group"/>
    </component>
+   <component id="omadrm_qt_build" filter="s60" name="OMA DRM Qt Build" introduced="^4">
+    <unit bldFile="omadrm" qt:proFile="omadrm.pro"/>
+   </component>
    <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
     <unit bldFile="omadrm/foundationcerts/group"/>
    </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,10 +1,5 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
-  <collection id="appfoundation" name="App Foundation" level="generic">
-     <component id="appfoundation_build" name="App Foundation Build"  introduced="^4">
-      <unit bldFile="appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
-     </component>
-  </collection>
   <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
      <component id="hswidgetmodel_build" name="Home Screen Widget Model Build"  introduced="^4">
       <unit bldFile="hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
@@ -38,18 +33,12 @@
     <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
     <unit base="homescreensrv_plat/menu_sat_interface_api"/>
    </component>
-   <component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/appruntimemodel_api"/>
-   </component>
    <component id="contentstorage_api" name="Content Storage API" class="api" filter="s60" introduced="^4">
     <unit base="homescreensrv_plat/contentstorage_api"/>
    </component>
    <component id="hswidgetmodel_api" name="HS Widget Model API" class="api" filter="s60" introduced="^4">
     <unit base="homescreensrv_plat/hswidgetmodel_api"/>
    </component>
-   <component id="statemodel_api" name="State Model API" class="api" filter="s60" introduced="^4">
-    <unit base="homescreensrv_plat/statemodel_api"/>
-   </component>
    <component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
     <unit base="homescreensrv_plat/homescreen_information_api"/>
    </component>
@@ -70,6 +59,12 @@
       <unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
      </component>
   </collection>
+   <collection id="tsdevicedialog" name="Task Switcher Device Dialog" level="plugin">
+     <component id="tsdevicedialog_build" name="Task Switcher Device Dialog Build"  introduced="^4">
+		<!-- break this up into real components -->
+      <unit bldFile="tsdevicedialog" qt:qmakeArgs="-r" qt:proFile="tsdevicedialog.pro"/>
+     </component>
+  </collection>
     <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
      <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
       <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -2,6 +2,9 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <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="ipcm_plat_qt_build" name="IP Connectivity Management Qt Platform Interfaces" class="api" filter="s60" introduced="^4">
+    <unit bldFile="ipcm_plat" qt:proFile="ipcm_plat.pro"/>
+   </component>
    <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"/>
@@ -48,6 +51,10 @@
    <component id="flextimer_api" name="Flex Timer API" class="api" filter="s60" introduced="^4">
     <unit bldFile="ipcm_plat/flextimer_api/group"/>
    </component>
+   <component id="mpm_vpn_toggle_api" name="MPM VPN Toggle API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="ipcm_plat/mpm_vpn_toggle_api/mpm_vpn_toggle_api.metaxml"/>
+    <unit bldFile="ipcm_plat/mpm_vpn_toggle_api/group"/>
+   </component>
   </collection>
   <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">
@@ -111,6 +118,24 @@
    <component id="cmmgr" filter="s60" name="CM Manager">
     <unit bldFile="cmmanager/cmmgr/group"/>
    </component>
+   <component id="connection_settings_shim" name="Connection Settings Shim" introduced="^4">
+     <unit bldFile="cmmanager/connection_settings_shim" qt:proFile="connection_settings_shim.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cmapplsettingsui" name="Connection Settings UI" introduced="^4">
+     <unit bldFile="cmmanager/cmapplsettingsui" qt:proFile="cmapplsettingsui.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cpipsettingsplugin" name="Connection Settings IP Plugin" class="plugin" introduced="^4">
+     <unit bldFile="cmmanager/cpipsettingsplugin" qt:proFile="cpipsettingsplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cpdestinationplugin" name="CP Destination Plugin" class="plugin" introduced="^4">
+     <unit bldFile="cmmanager/cpdestinationplugin" qt:proFile="cpdestinationplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cppacketdataapplugin" name="CP Packet Data AP Pplugin" class="plugin" introduced="^4">
+     <unit bldFile="cmmanager/cppacketdataapplugin" qt:proFile="cppacketdataapplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cpwlanapplugin" name="CP WLAN AP Plugin" class="plugin" introduced="^4">
+     <unit bldFile="cmmanager/cpwlanapplugin" qt:proFile="cpwlanapplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
    <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
@@ -124,11 +149,23 @@
    <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
     <unit bldFile="connectionmonitoring/connmonext/group"/>
    </component>
+   <component id="cellularindicatorplugin" name="Cellular Indicator Plugin" class="plugin" introduced="^4">
+     <unit bldFile="connectionmonitoring/cellularindicatorplugin" qt:proFile="cellularindicatorplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="indicatorobserver" name="Indicator Observer" introduced="^4">
+     <unit bldFile="connectionmonitoring/indicatorobserver" qt:proFile="indicatorobserver.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="connectionmonitoringnview" name="Connection View" introduced="^4">
+     <unit bldFile="connectionmonitoring/connectionview" qt:proFile="connectionview.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="connectionutilities" name="Connection Utilities" level="utils">
    <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
     <unit bldFile="connectionutilities/connectiondialogs/group"/>
    </component>
+   <component id="confirmqueries" name="Confirm Queries" introduced="^4">
+     <unit bldFile="connectionutilities/confirmqueries" qt:proFile="confirmqueries.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="keepalive" name="Keep Alive" level="server">
    <component id="flextimer" filter="s60" name="Flex Timer" introduced="^4">
@@ -161,9 +198,6 @@
     <!-- need to move exports to another component, or make this a config component and revmove the #includes -->
     <unit bldFile="group"/>
    </component>
-   <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
-     <unit bldFile="." qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/legacypresence/package_definition.xml
--- a/symbian4/mw/legacypresence/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -54,40 +54,5 @@
     <unit bldFile="pressrv_plat/simple_instant_msg_api/group"/>
    </component>
   </collection>
-  <collection id="xdmengine" name="XDM Engine" level="engine">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-   <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
-    <unit bldFile="xdmengine/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">
-    <unit bldFile="xdmprotocols/group"/>
-   </component>
-  </collection>
-  <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
-    <unit bldFile="msgconnmanager/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">
-    <unit bldFile="simpleengine/group"/>
-   </component>
-  </collection>
-  <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
-    <unit bldFile="presencefwsimpleadpt/group"/>
-   </component>
-  </collection>
-  <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
-   <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
-    <unit bldFile="simpledatamodeladapter/group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/mds/package_definition.xml
--- a/symbian4/mw/mds/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -70,6 +70,36 @@
    </component>
   </collection>
   <collection id="locationmanager" name="Location Manager" level="mgr">
+   <component id="geoconverter" filter="s60" name="Geoconverter" introduced="^4">
+    <meta rel="config">
+    <defined condition="_LOC_GEOTAGGING_CELLID"/>
+   </meta>
+    <unit bldFile="locationmanager/geoconverter/group"/>
+   </component>
+   <component id="geo_tagcreator" filter="s60" name="Geo Tag Creator" introduced="^4">
+    <meta rel="config">
+    <defined condition="_LOC_REVERSEGEOCODE"/>
+   </meta>
+    <unit bldFile="locationmanager/tagcreator/group"/>
+   </component>
+   <component id="reversegeocode" filter="s60" name="Reverse Geocode" introduced="^4">
+    <meta rel="config">
+    <defined condition="_LOC_REVERSEGEOCODE"/>
+   </meta>
+    <unit bldFile="locationmanager/ReverseGeocode/group"/>
+   </component>
+   <component id="reversegeocoderplugin" filter="s60" name="Reverse Geo-Coder Plugin" class="plugin" introduced="^4">
+    <meta rel="config">
+    <defined condition="_LOC_REVERSEGEOCODE"/>
+   </meta>
+    <unit bldFile="locationmanager/ReverseGeoCoderPlugin/group"/>
+   </component>
+   <component id="geotagger" filter="s60" name="Geo Tagger" introduced="^4">
+    <meta rel="config">
+    <defined condition="_LOC_REVERSEGEOCODE"/>
+   </meta>
+    <unit bldFile="locationmanager/geotagger/group"/>
+   </component>
    <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
     <unit bldFile="locationmanager/locationtrail/group"/>
    </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/messagingmw/package_definition.xml
--- a/symbian4/mw/messagingmw/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -18,12 +18,6 @@
       <unit bldFile="msgfw_plat/muiu_utils_api/group"/>
    </component>
   </collection>
-  <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" class="config">
-    <unit bldFile="msgbranched/group"/>
-   </component>
-  </collection>
   <collection id="messagingfw" name="Messaging Framework" level="fw">
    <!-- should break this collection up into smaller related collections -->
    <component id="send_ui_api" name="Send UI API" class="api" filter="s60" deprecated="^4">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/mmmw/package_definition.xml
--- a/symbian4/mw/mmmw/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -69,7 +69,7 @@
     <unit bldFile="mmmw_plat/emc_audio_effects_api/group"/>
    </component>
    <component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/call_audio_control_api/call_audiocontrol_api.metaxml"/>
+    <meta rel="Api" href="mmmw_plat/call_audio_control_api/call_audio_control_api.metaxml"/>
     <unit bldFile="mmmw_plat/call_audio_control_api/group" filter="!test"/>
     <unit bldFile="mmmw_plat/call_audio_control_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/netprotocols/package_definition.xml
--- a/symbian4/mw/netprotocols/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/netprotocols/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -25,7 +25,7 @@
    <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
     <unit bldFile="httpfilters/deflatefilter/group"/>
    </component>
-   <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+   <component id="httpfilteracceptheader" filter="s60,test" name="Accept Header Filter" class="plugin">
     <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
    </component>
    <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
@@ -40,7 +40,7 @@
    <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
     <unit bldFile="httpfilters/httpfilterproxy/group"/>
    </component>
-   <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+   <component id="uaproffilter" filter="s60,test" name="UAProf Filter" class="plugin">
     <unit bldFile="httpfilters/uaproffilter/group"/>
    </component>
   </collection>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -160,6 +160,10 @@
    <component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
     <unit bldFile="phonesrv_plat/dialpad_api/group"/>
    </component>
+   <component id="phone_settings_ui_notes_api" name="Phone Settings UI Notes API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_ui_notes_api/phone_settings_ui_notes_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_ui_notes_api/group"/>
+   </component>
   </collection>
   <collection id="telutils" name="Telephony Utils" level="utils">
    <component id="phoneparser" filter="s60" name="Phone Parser">
@@ -204,6 +208,9 @@
     <unit bldFile="cellular/psetnotesui/group" filter="!test"/>
     <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
+   <component id="psuinotes" filter="s60" name="Phone Settings Notes UI" introduced="^4">
+    <unit bldFile="cellular/psuinotes" qt:proFile="psuinotes.pro"/>
+   </component>
    <component id="servicerequest" filter="s60" name="Service Request">
     <unit bldFile="cellular/servicerequest/group"/>
    </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -10,7 +10,7 @@
     </collection>
     <collection id="qt_info" name="Qt Info" level="mw">
             <component id="qt_build" name="Qt Build" introduced="^2">
-  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
@@ -18,7 +18,7 @@
 			  <meta rel="testbuild">
 			   <group name="qtdemos"/>
 			  </meta>
-                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qtexamples" name="Qt Examples" level="app">
@@ -26,7 +26,7 @@
 			   <group name="qtdemos"/>
 			  </meta>
             <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="test,qtexamples,build_as_app">
-                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qt_tests" name="Qt Tests" level="app">
@@ -34,13 +34,13 @@
 				  <meta rel="qttestsauto">
 				   <group name="qtdemos"/>
 				  </meta>
-                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:qmakeArgs="-r"/>
             </component>
             <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test,build_as_app">
 				  <meta rel="testbuild">
 				   <group name="qttestsbenchmarks"/>
 				  </meta>
-                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
   </package>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/remoteconn/package_definition.xml
--- a/symbian4/mw/remoteconn/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -14,6 +14,9 @@
     <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
    </component>
    <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+    <meta rel="config">
+     <defined condition="FF_MTP_CONTROLLER"/>
+    </meta>
     <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
    </component>
   </collection>
@@ -32,6 +35,9 @@
    <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
     <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
    </component>
+   <component id="mtpplaybackcontroldp" name="MTP Playback Control Data Provider" introduced="^4" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpplaybackcontroldp/group" mrp="mtpdataproviders/mtpplaybackcontroldp/group/mtp_playbackcontroldp.mrp"/>
+   </component>
   </collection>
   <collection id="backupandrestore" name="Backup and Restore" level="specific">
    <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
   <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
    <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
@@ -120,10 +120,6 @@
     <meta rel="Api" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
    </component>
-   <component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/sync_service_api/sync_service_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/sync_service_api/group"/>
-   </component>
    <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
     <unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
    </component>
@@ -137,19 +133,19 @@
    <component id="devicemgmt_dialogs_api" name="Device Management Dialogs API" class="api" filter="s60" introduced="^4">
     <unit bldFile="remotemgmt_plat/devicemgmt_dialogs_api/group"/>
    </component>
+   <component id="dm_device_dialog_api" name="DM Device Dialog API" class="api" filter="s60" introduced="^4">
+    <meta rel="Api" href="remotemgmt_plat/dm_device_dialog_api/dm_device_dialog_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/dm_device_dialog_api/group"/>
+   </component>
   </collection>
   <collection id="policymanagement" name="Policy Management" level="generic">
-   <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
-    <unit bldFile="policymanagement/pmdmadapter/group"/>
-   </component>
-   <component id="dmutilserver" filter="s60" name="DM Util Server">
-    <unit bldFile="policymanagement/dmutilserver/group"/>
+   <component id="policyenginepolicies" name="Policy Engine Policies" filter="s60,!dfs_build">
+    <unit bldFile="policymanagement/policyengine/policyenginepolicies/group"/>
    </component>
    <component id="policyengine" filter="s60" name="Policy Engine">
-    <unit bldFile="policymanagement/policyengine/group" filter="!dfs_build"/>
+    <unit bldFile="policymanagement/policyengine" qt:proFile="policyengine.pro"/>
    </component>
-   <component id="policymanagement_build" filter="s60" name="Policy Management Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
+   <component id="policymanagement_config" filter="s60" name="Policy Management Config" class="config">
     <unit bldFile="policymanagement/group"/>
    </component>
   </collection>
@@ -209,25 +205,23 @@
    </component>
   </collection>
   <collection id="fotaapplication" name="FOTA Application" level="generic">
+   <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+	<!-- need to make this a real component: move down a dir? break up? -->
+    <unit bldFile="fotaapplication/group"/>
+   </component>
    <component id="fotaserver" filter="s60" name="FOTA Server">
-    <meta rel="config">
-     <defined condition="__SYNCML_DM_FOTA"/>
-    </meta>
-    <unit bldFile="fotaapplication/fotaserver/group"/>
+    <unit bldFile="fotaapplication/fotaserver" qt:proFile="fotaserver.pro"/>
    </component>
-   <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-    <meta rel="config">
-     <defined condition="__SYNCML_DM"/>
-     <not-defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
-    </meta>
-    <unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>
+  </collection>
+  <collection id="devicemgmtnotifications" name="Device Management Notifications" level="server">
+   <component id="devicemgmtnotifications_rom" filter="s60" name="DM Notifications ROM" introduced="^4">
+    <unit bldFile="devicemgmtnotifications/rom"/>
    </component>
-   <!-- really need to find a better way to do this -->
-   <component id="fotacustcmds-alt" filter="s60" name="FOTA Custom Commands">
-    <meta rel="config">
-     <defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
-    </meta>
-    <unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>
+   <component id="dmdevdialogclient" filter="s60" name="DM Device Dialog Client" introduced="^4">
+    <unit bldFile="devicemgmtnotifications/dmdevdialogclient/bld"/>
+   </component>
+   <component id="dmdevdialogserver" filter="s60" name="DM Device Dialog Server" introduced="^4">
+    <unit bldFile="devicemgmtnotifications/dmdevdialogserver/bld"/>
    </component>
   </collection>
  </package>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/searchsrv/package_definition.xml
--- a/symbian4/mw/searchsrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -33,7 +33,7 @@
        <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
 			<unit bldFile="searcher/SearchServer/group"/>
        </component>
-       <component id="searcher_test" name="Searcher Tests" filter="s60,test" purpose="development" introduced="^4">
+       <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
 			<!-- #include from common bld.inf or split into two components -->
 			<unit bldFile="searcher/tsrc/RobustnessTest/group"/>
 			<unit bldFile="searcher/tsrc/LogPlayer/group"/>
@@ -44,7 +44,7 @@
 			<unit bldFile="harvester/pluginfw/group"/>
        </component>
        <component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
-			<unit bldFile="harvester/HarvesterServer/group"/>
+			<unit bldFile="harvester/harvesterserver" qt:proFile="harvester.pro"/>
        </component>
     </collection>
     <collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
@@ -53,18 +53,8 @@
        </component>
     </collection>
     <collection id="qcpix" name="Qt CPIX" level="engine">     
-     <component id="qcpixsearchclient" name="Qt CPIX Search Client" introduced="^4">
-    	<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
-      <unit bldFile="qcpix"  qt:proFile="qcpixsearchclient.pro"/>
-     </component>
-     <component id="qsamplesearch" name="Qt CPIX Sample Search" filter="test" introduced="^4">
-      <unit bldFile="qcpix/tsrc/SampleSearch"  qt:proFile="SampleSearch.pro"/>
-     </component>
-     <component id="orbitsearch" name="Qt CPIX Orbit Search" filter="test" introduced="^4">
-      <unit bldFile="qcpix/tsrc/orbitsearch"  qt:proFile="orbitsearch.pro"/>
-     </component>
-     <component id="qcpixunittests" name="Qt CPIX Unit Tests" filter="test" introduced="^4">
-      <unit bldFile="qcpix/tsrc/qtcpixunittests"  qt:proFile="qtcpixunittests.pro"/>
+    <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
+      <unit bldFile="qcpix"  qt:proFile="qcpix.pro"/>
      </component>
     </collection>
     <collection id="searchsrv_info" name="Search Services Info">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -102,6 +102,9 @@
    <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
     <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
    </component>
+   <component id="untrustedcertificatedialog" filter="s60" name="Untrusted Certificate Dialog" introduced="^4">
+    <unit bldFile="pkiutilities/untrustedcertificatedialog" qt:proFile="untrustedcertificateplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="wim" name="Wireless Identity Module" level="framework">
    <!-- collection is really a component. Need to move down a directory-->
@@ -119,9 +122,6 @@
    <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
     <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
    </component>
-   <component id="autolock" name="Autolock" filter="s60">
-    <unit bldFile="securitydialogs/autolock" qt:proFile="autolock.pro"/>
-   </component>
    <component id="secui" filter="s60" name="Security UI">
     <unit bldFile="securitydialogs/secui/group"/>
    </component>
@@ -138,8 +138,17 @@
    <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
       <unit bldFile="securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
    </component>
+   <component id="indicatorautolockplugin" name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+		<!-- directory at the wrong level to be a component-->
+      <unit bldFile="securitydialogs/autolock/indicatorplugin" qt:proFile="indicatorautolockplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
    <component id="autolockuseractivityservice" name="Auto Lock User Activity Service" introduced="^4" filter="s60">
-      <unit bldFile="securitydialogs/Autolock/autolockuseractivityservice" qt:proFile="autolockuseractivityservice.pro" qt:qmakeArgs="-r"/>
+		<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+      <unit bldFile="securitydialogs/autolock" qt:proFile="autolockuseractivityservice.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="autolocksrv" name="Auto Lock Server" introduced="^4" filter="s60">
+		<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+      <unit bldFile="securitydialogs/autolock" qt:proFile="autolock.pro" qt:qmakeArgs="-r"/>
    </component>
   </collection>
   <collection id="cpsecplugins" name="Security Settings Plugins" level="plugin">
@@ -197,7 +206,7 @@
   </collection>
   <collection id="securitysrv_info" name="Security Services Info" level="specific">
    <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
-    <unit bldFile="tsrc/group"/>
+    <unit bldFile="tsrc/group" filter="TA_SECURITYSRV"/>
    </component>
    <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -74,10 +74,10 @@
     <unit bldFile="usbclasses/usbphoneasmodem/group"/>
    </component>
   </collection>
-
   <collection id="usbuis" name="USB UIs" level="specific">
    <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
-    <unit bldFile="usbuis/usbuinotif" qt:proFile="usbuinotif.pro" qt:qmakeArgs="-r"/>
+    <unit bldFile="usbuis/usbuinotif" qt:proFile="usbuinotif.pro" qt:qmakeArgs="-r" filter="!test"/>
+    <unit bldFile="usbuis/usbuinotif/tsrc/USBUiNotifApiTest/group" filter="test,api_test" />
    </component>
    <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
     <unit bldFile="usbuis/imageprintuiprovider/group"/>
@@ -92,10 +92,5 @@
       <unit bldFile="usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro" qt:qmakeArgs="-r"/>
     </component>
   </collection>
-  <collection id="usbservices_test" name="USB Services Test" level="server">
-     <component id="usbservices_test_build" name="USB Services Test Build" filter="test,api_test,s60"  introduced="^4">
-      <unit bldFile="tsrc/group"/>
-     </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -48,10 +48,6 @@
     <meta rel="Api" href="web_plat/connection_manager_api/connection_manager_api.metaxml"/>
     <unit bldFile="web_plat/connection_manager_api/group"/>
    </component>
-   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/cxml_library_api/cxml_library_api.metaxml"/>
-    <unit bldFile="web_plat/cxml_library_api/group"/>
-   </component>
    <component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
     <meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
     <unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
@@ -95,10 +91,6 @@
     <meta rel="Api" href="web_plat/widget_registry_api/widget_registry_api.metaxml"/>
     <unit bldFile="web_plat/widget_registry_api/group"/>
    </component>
-   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
-    <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
-    <unit bldFile="web_plat/xml_parser_api/group"/>
-   </component>
   </collection>
   <collection id="browserutilities" name="Browser Utilities" level="utils">
    <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
@@ -107,12 +99,6 @@
    <component id="recenturlstore" filter="s60" name="Recent URL Store">
     <unit bldFile="browserutilities/recenturlstore/group"/>
    </component>
-   <component id="xmlparser" filter="s60" name="XML Interface">
-    <unit bldFile="browserutilities/xmlparser/group"/>
-   </component>
-   <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
-    <unit bldFile="browserutilities/cxmllibrary/group"/>
-   </component>
    <component id="downloadmgr" filter="s60" name="Download Manager">
     <unit bldFile="browserutilities/downloadmgr/group"/>
    </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -20,55 +20,38 @@
    </component>
   </collection>
   <collection id="hotspotfw" name="HotSpot Framework" level="framework">
-   <component id="hsserver" filter="s60" name="HotSpot Server">
-    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-   </component>
-   <component id="hsclient" filter="s60" name="HotSpot Client">
-    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-   </component>
-   <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-   </component>
-   <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-   </component>
-   <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-   </component>
-   <component id="hsbrowser" filter="s60" name="HotSpot Browser">
-    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-    <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-   </component>
-   <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
-    <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+	<!-- collection is really a component. Needs to move down a dir -->
+   <component id="hotspotfw_build" filter="s60" name="HotSpot Framework Build">
     <unit bldFile="hotspotfw/group"/>
    </component>
   </collection>
   <collection id="wlanutilities" name="WLAN Utilities" level="generic">
-   <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
-	<!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-      <unit bldFile="wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
-    </component>
    <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
-    <!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+    <unit bldFile="wlanutilities/wlanqtutilities" qt:proFile="wlanqtutilities.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="eapwizard " filter="s60" name="EAP Wizard" introduced="^4">
+    <unit bldFile="wlanutilities/eapwizard" qt:proFile="eapwizard.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="wpswizard " filter="s60" name="WPS Wizard" introduced="^4">
+    <unit bldFile="wlanutilities/wpswizard" qt:proFile="wpswizard.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="wlanwizard " filter="s60" name="WLAN Wizard" introduced="^4">
-    <!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
+    <unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
-    <!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
+    <unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlansniffer.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
+    <unit bldFile="wlanutilities/wlanentryplugin" qt:proFile="wlanentryplugin.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
+    <unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin"  introduced="^4">
-    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
+    <unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="wlanlogin" filter="s60" name="WLAN Login" introduced="^4">
+    <unit bldFile="wlanutilities/wlanlogin" qt:proFile="wlanlogin.pro" qt:qmakeArgs="-r"/>
    </component>
   </collection>
  </package>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/bt/package_definition.xml
--- a/symbian4/os/bt/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -95,5 +95,10 @@
     <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
    </component>
   </collection>
+    <collection id="btsimulator" name="Bluetooth Simulator" level="internal-utils">
+      <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaption Stub" introduced="^3" purpose="optional" filter="s60">
+        <unit bldFile="btsimulator/btaudioadaptation_stub/group"/>
+      </component>
+    </collection>
  </package>
 </SystemDefinition>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+    <meta rel="License">
+      <license type="EPL"><supplier>Nokia</supplier></license>	
+    </meta>
     <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
@@ -32,9 +35,6 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
-      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
-        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-      </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
         <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
       </component>
@@ -120,6 +120,14 @@
 			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
       </component>
     </collection>
+    <collection id="cbsref" name="CBS Reference" level="plugin">
+      <component id="csyrefplugins" name="CSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
+        <unit bldFile="cbsref/csyrefplugins/group"/>
+      </component>
+      <component id="telephonyrefplugins" name="TSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
+        <unit bldFile="cbsref/telephonyrefplugins/group"/>
+      </component>
+    </collection>        
     <collection id="wapstack" name="WAP Stack" level="plugin">
       <component id="wapmessageapi" name="WAP Message API" purpose="optional">
         <unit bldFile="wapstack/wapmessageapi/group" mrp="wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp" /> 
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -200,6 +200,7 @@
       <package id="search" level="apps" tech-domain="pr" href="../../../../app/search/package_definition.xml"/>
       <package id="contacts" level="apps" span="2" tech-domain="pr" href="../../../../app/contacts/package_definition.xml"/>
       <package id="organizer" level="apps" span="2" tech-domain="pr" href="../../../../app/organizer/package_definition.xml"/>
+	  <package id="calendarwidget" level="apps" tech-domain="pr" href="../../../../app/calendarwidget/package_definition.xml"/>
       <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition.xml"/>
       <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
       <package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition.xml"/>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -3,6 +3,7 @@
  <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
   <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
    <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
+	<!-- this needs to be moved to deviceplatformrelease -->
     <meta rel="Api" href="devicesrv_pub/platform_path_definitions_api/platform_path_definitions_api.metaxml"/>
     <unit bldFile="devicesrv_pub/platform_path_definitions_api/group"/>
    </component>
@@ -390,7 +391,7 @@
     <!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
     <unit bldFile="resourcemgmt/group"/>
    </component>
-   <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+   <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" filter="s60">
     <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
    </component>
   </collection>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -156,9 +156,6 @@
       </component>
     </collection>
     <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
-      <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
-        <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
-      </component>
       <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
 	<unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
       </component>
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -386,13 +386,17 @@
     <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
    </component>
   </collection>
-  <collection id="audio" name="Audio Codecs" level="middleware">
-   <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
-    <unit bldFile="audio/arm_cmmf_codecs/group"/>
+  <collection id="frametable_stub" name="Frametable Stub" level="device-fw">
+	<!-- collection is really a component. Needs to move down a directory -->
+   <component id="frametable_stub_build" name="Frametable Stub Build" filter="s60" introduced="^4">
+    <unit bldFile="frametable_stub/group"/>
    </component>
   </collection>
-  <collection id="video" name="Video Codecs" level="middleware">
-   <!-- empty -->
+  <collection id="eaacplusutil_stub" name="eAAC Plus Utils Stub" level="hw-if">
+	<!-- collection is really a component. Needs to move down a directory -->
+   <component id="eaacplusutil_stub_build" name="eAAC Plus Utils Stub Build" filter="s60" introduced="^4">
+    <unit bldFile="eaacplusutil_stub/group"/>
+   </component>
   </collection>
   <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
    <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
diff -r 18ee574c682a -r 633f3bea9521 symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -66,9 +66,6 @@
    <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">
-    <unit bldFile="memspy/console/group"/>
-   </component>
    <component id="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
     <unit bldFile="memspy/MemSpyServer/group"/>
    </component>
@@ -130,10 +127,5 @@
       <unit bldFile="analyzetool/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 18ee574c682a -r 633f3bea9521 symbian4/os/xmlsrv/package_definition.xml
--- a/symbian4/os/xmlsrv/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -14,6 +14,14 @@
     <meta rel="Api" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
     <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/>
    </component>
+	   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+		<meta rel="Api" href="xmlsrv_plat/cxml_library_api/cxml_library_api.metaxml"/>
+		<unit bldFile="xmlsrv_plat/cxml_library_api/group"/>
+	   </component>
+	   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+		<meta rel="Api" href="xmlsrv_plat/xml_parser_api/xml_parser_api.metaxml"/>
+		<unit bldFile="xmlsrv_plat/xml_parser_api/group"/>
+	   </component>
   </collection>
   <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
    <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
@@ -31,25 +39,66 @@
   </collection>
   <collection id="xml" name="XML" level="generic">
    <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
-    <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
-   </component>
-   <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
-    <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-   </component>
-   <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-    <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
-   </component>
-   <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
-    <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-   </component>
-   <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-   </component>
-   <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
-    <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-   </component>
-   <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
-    <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp" filter="!test"/>
+        <unit bldFile="xml/xmlfw/test/rtest/group" filter="test,api_test"/>
+      </component>
+      <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp" filter="!test"/>
+        <unit bldFile="xml/libxml2libs/test" filter="test,api_test"/>
+      </component>
+      <component id="libxml2libs_test" name="Libxml2 Libraries STIF Tests" introduced="^3" purpose="development" filter="test,api_test">
+        <!-- can't have a component live under another component. Need to move to a new directory -->
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_stif"/>
+        </meta>
+        <unit bldFile="xml/libxml2libs/test/xmlengtester/xmlengtester_target/group"/>
+      </component>
+      <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" filter="!test"/>
+        <unit bldFile="xml/legacyminidomparser/XMLParser/test/group" filter="test,api_test"/>
+      </component>
+      <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp" filter="!test"/>
+        <unit bldFile="xml/xmldomandxpath/test/tef/group" filter="test,api_test"/>
+      </component>
+      <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp" filter="!test"/>
+        <unit bldFile="xml/xmlexpatparser/test/rtest/group" filter="test,api_test"/>
+      </component>
+      <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp" filter="!test"/>
+        <unit bldFile="xml/xmllibxml2parser/test/tef/xmlparser2/group" filter="test,api_test"/>
+      </component>
+      <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp" filter="!test"/>
+        <unit bldFile="xml/wbxmlparser/test/rtest/group" filter="test,api_test"/>
+      </component>
+      <component id="cxmllibrary" filter="s60" name="cXml Library">
+        <unit bldFile="xml/cxmllibrary/group"/>
+      </component>
+      <component id="xmlparser" filter="s60" name="XML Interface">
+        <unit bldFile="xml/xmlparser/group"/>
    </component>
   </collection>
   <collection id="xmlsrv_info" name="XML Services Info" level="specific">