# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266499539 0
# Node ID be4b446b3f5fe67c1e333e8b75f14b0f1f0dc9cb
# Parent  707fabfd7b5a0162af832cdadc812667fc3b5088
More integration issues

diff -r 707fabfd7b5a -r be4b446b3f5f symbian3/os/buildtools/package_definition.xml
--- a/symbian3/os/buildtools/package_definition.xml	Thu Feb 18 13:16:29 2010 +0000
+++ b/symbian3/os/buildtools/package_definition.xml	Thu Feb 18 13:25:39 2010 +0000
@@ -120,7 +120,7 @@
           </component>
         </collection>
         <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-          <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="test" class="PC">
+          <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" filter="sf_build" class="PC">
             <unit mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group"/>
           </component>
         </collection>
diff -r 707fabfd7b5a -r be4b446b3f5f symbian3/os/cellularsrv/package_definition.xml
--- a/symbian3/os/cellularsrv/package_definition.xml	Thu Feb 18 13:16:29 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition.xml	Thu Feb 18 13:25:39 2010 +0000
@@ -150,7 +150,7 @@
           <component name="common_tsy" long-name="Common TSY" introduced="^2" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
           </component>
-          <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="test" plugin="Y">
+          <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="^2" purpose="development" filter="sf_build" plugin="Y">
             <unit mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
           </component>
           <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
diff -r 707fabfd7b5a -r be4b446b3f5f symbian3/os/deviceplatformrelease/package_definition.xml
--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Thu Feb 18 13:16:29 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Thu Feb 18 13:25:39 2010 +0000
@@ -80,7 +80,7 @@
         <collection name="s60extras" long-name="S60 Extras" level="mid">
           <!-- collection is really a component. Need to move down a directory -->
           <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/s60extras/group"/>
+            <unit bldFile="/sf/os/deviceplatformrelease/S60Extras/group"/>
           </component>
         </collection>
         <collection name="locfiles" long-name="Locale Files" level="mid">
@@ -141,7 +141,7 @@
         <collection name="version" long-name="Version" level="top">
           <!-- collection is really a component. Need to move down a directory -->
           <component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/version/group"/>
+            <unit bldFile="/sf/os/deviceplatformrelease/Version/group"/>
           </component>
         </collection>
         <collection name="helps_loc2" long-name="Helps Locale 2" level="top">
@@ -152,6 +152,10 @@
         </collection>
         <collection name="sf_config" long-name="SF Config" level="mid">
           <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
+          <component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
+            <!-- will shoudl give the id/path something more unique than cenrep -->
+            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/cenrep/group"/>
+          </component>
         </collection>
         <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">
diff -r 707fabfd7b5a -r be4b446b3f5f symbian3/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Thu Feb 18 13:16:29 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml	Thu Feb 18 13:25:39 2010 +0000
@@ -81,6 +81,7 @@
         <unit base="sf_config/config"/>
       </component>
       <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+		<!-- will shoudl give the id/path something more unique than cenrep -->
         <unit bldFile="sf_config/cenrep/group"/>
       </component>
     </collection>
diff -r 707fabfd7b5a -r be4b446b3f5f symbian3/os/networkingsrv/package_definition_3.0.xml
--- a/symbian3/os/networkingsrv/package_definition_3.0.xml	Thu Feb 18 13:16:29 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml	Thu Feb 18 13:25:39 2010 +0000
@@ -89,9 +89,6 @@
       <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
       </component>
-      <component id="ipupsplugins" name="IP UPS" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="networkcontrol/ipupsplugins/group"/>
-      </component>
       <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
         <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
       </component>