# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1273159481 -3600
# Node ID 6337e330f518e5e51ccdbad43609f829cd00e881
# Parent  890e435369ae0f244778fa2decd85fc669d40110
Fix LBS to point to proper sfgroup hack. Add introduced values to new contentcontrol APIs

diff -r 890e435369ae -r 6337e330f518 symbian3/app/contentcontrol/package_definition.xml
--- a/symbian3/app/contentcontrol/package_definition.xml	Thu May 06 13:52:58 2010 +0100
+++ b/symbian3/app/contentcontrol/package_definition.xml	Thu May 06 16:24:41 2010 +0100
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
@@ -87,10 +87,10 @@
           <component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
             <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
           </component>
-          <component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" class="api">
+          <component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" introduced="^3" class="api">
             <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
           </component>
-          <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
+          <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
             <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
           </component>
         </collection>
diff -r 890e435369ae -r 6337e330f518 symbian3/app/contentcontrol/package_definition_3.0.xml
--- a/symbian3/app/contentcontrol/package_definition_3.0.xml	Thu May 06 13:52:58 2010 +0100
+++ b/symbian3/app/contentcontrol/package_definition_3.0.xml	Thu May 06 16:24:41 2010 +0100
@@ -14,11 +14,11 @@
     <meta rel="Api" href="contentctrl_plat/ds_folder_util_api/ds_folder_util_api.metaxml"/>
     <unit bldFile="contentctrl_plat/ds_folder_util_api/group"/>
    </component>
-   <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+   <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60" introduced="^3">
     <meta rel="Api" href="contentctrl_plat/adapter_customization_api/adapter_customization_api.metaxml"/>
     <unit bldFile="contentctrl_plat/adapter_customization_api/group"/>
    </component>
-   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60" introduced="^3">
     <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
     <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
    </component>
diff -r 890e435369ae -r 6337e330f518 symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Thu May 06 13:52:58 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Thu May 06 16:24:41 2010 +0100
@@ -140,18 +140,20 @@
             <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"/>
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" 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"/>
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" 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">
+          <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/common/suplrrlpprotocol/group"/>
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
           </component>
         </collection>
         <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
diff -r 890e435369ae -r 6337e330f518 symbian3/os/lbs/package_definition_3.0.xml
--- a/symbian3/os/lbs/package_definition_3.0.xml	Thu May 06 13:52:58 2010 +0100
+++ b/symbian3/os/lbs/package_definition_3.0.xml	Thu May 06 16:24:41 2010 +0100
@@ -64,18 +64,20 @@
         <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"/>
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" 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"/>
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" 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">
+      <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
       </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">