# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1273071916 -3600
# Node ID b63fe30d6d267e5361c8039240f3f30b4e4c2495
# Parent  eaaf32b9864ff3e61b9d7d49fe7c66a07d4ae215
Reinstate "removed components" in os/lbs which are still present and needed in wk17 drop of S^3

diff -r eaaf32b9864f -r b63fe30d6d26 symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Wed May 05 15:08:21 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Wed May 05 16:05:16 2010 +0100
@@ -139,10 +139,20 @@
           <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="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+            <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">
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/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/common/suplrrlpasn1/group"/>
           </component>
+          <component name="suplrrlpprotocol" filter="sf_build" 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/common/suplrrlpprotocol/group"/>
+          </component>
         </collection>
         <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
           <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
diff -r eaaf32b9864f -r b63fe30d6d26 symbian3/os/lbs/package_definition_3.0.xml
--- a/symbian3/os/lbs/package_definition_3.0.xml	Wed May 05 15:08:21 2010 +0100
+++ b/symbian3/os/lbs/package_definition_3.0.xml	Wed May 05 16:05:16 2010 +0100
@@ -63,10 +63,20 @@
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
+      <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+      </component>
+      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      </component>
       <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
       </component>
+      <component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
+      </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">
       <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">