--- a/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -144,12 +144,6 @@
 <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
 </component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
 <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
 </component>
@@ -180,9 +174,6 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
-<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
-</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">

--- a/CompilerCompatibility/os/lbs/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -113,13 +113,6 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
-<component name="networkpmutils" long-name="Networkpm Utils" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/networkpmutils/group" mrp="/sf/os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -132,14 +125,6 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
-</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">

--- a/RCL_3/mw/remotemgmt/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/RCL_3/mw/remotemgmt/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -144,12 +144,6 @@
 <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
 </component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
 <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
 </component>
@@ -180,9 +174,6 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
-<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
-</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">

--- a/RCL_3/os/lbs/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/RCL_3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -113,13 +113,6 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
-<component name="networkpmutils" long-name="Networkpm Utils" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/networkpmutils/group" mrp="/sf/os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -132,14 +125,6 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
-</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">

--- a/symbian3/mw/remotemgmt/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -144,12 +144,6 @@
 <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
 </component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
 <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
 </component>
@@ -180,9 +174,6 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
-<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
-</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">

--- a/symbian3/os/lbs/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -113,13 +113,6 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
-<component name="networkpmutils" long-name="Networkpm Utils" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/networkpmutils/group" mrp="/sf/os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -132,14 +125,6 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
-</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">

--- a/tip_bulk_s3/mw/remotemgmt/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/tip_bulk_s3/mw/remotemgmt/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -144,12 +144,6 @@
 <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
 </component>
-<component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-</component>
-<component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-</component>
 <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
 </component>
@@ -180,9 +174,6 @@
 <component name="syncml_ds_customization_api" long-name="SyncML DS Customization API" filter="s60" introduced="^3" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_ds_customization_api/group"/>
 </component>
-<component name="lawmo_plugin_api" long-name="Lawmo Plugin API" filter="s60" introduced="^3" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/lawmo_plugin_api/group"/>
-</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">

--- a/tip_bulk_s3/os/lbs/package_definition.xml	Tue Oct 26 17:33:50 2010 +0100
+++ b/tip_bulk_s3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
@@ -113,13 +113,6 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
-<component name="networkpmutils" long-name="Networkpm Utils" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/networkpmutils/group" mrp="/sf/os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
-</component>
-<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -132,14 +125,6 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
-</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">