# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1271767240 -3600
# Node ID 23977b7c7e58623feaafee3a3280ea284c028ccd
# Parent  2d3e0c71cfabcc2672400dae445b997531e0e8b8
Added config macros to ossrv and devciesrv. Removed some components from kernelhwsrv, cellularsrv, security, deviceplatformrelease

diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -87,11 +87,6 @@
             <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
           </component>
         </collection>
-        <collection name="fax" long-name="Fax" level="server">
-          <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
-            <unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-          </component>
-        </collection>
         <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
           <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
             <unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/cellularsrv/package_definition_3.0.xml
--- a/symbian4/os/cellularsrv/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -11,11 +11,6 @@
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
     </collection>
-    <collection id="fax" name="Fax" level="server">
-      <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
-        <unit bldFile="fax/faxclientandserver/Group" mrp="fax/faxclientandserver/Group/telephony_fax.mrp"/>
-      </component>
-    </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
       <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
         <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -83,61 +83,6 @@
             <unit bldFile="/sf/os/deviceplatformrelease/S60Extras/group"/>
           </component>
         </collection>
-        <collection name="locfiles" long-name="Locale Files" level="mid">
-          <component name="locfiles_build" filter="s60" long-name="S60 Locale Files Build" purpose="development" class="config">
-            <!-- need to move component down a directory -->
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group"/>
-          </component>
-          <component name="locfiles_set1" long-name="Locale Files Set 1" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set1"/>
-          </component>
-          <component name="locfiles_set2" long-name="Locale Files Set 2" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set2"/>
-          </component>
-          <component name="locfiles_set3" long-name="Locale Files Set 3" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set3"/>
-          </component>
-          <component name="locfiles_set4" long-name="Locale Files Set 4" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set4"/>
-          </component>
-          <component name="locfiles_set5" long-name="Locale Files Set 5" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set5"/>
-          </component>
-          <component name="locfiles_set6" long-name="Locale Files Set 6" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set6"/>
-          </component>
-          <!-- is the a problem with SF builds with the following? -->
-          <component name="locfiles_set7" long-name="Locale Files Set 7" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set7"/>
-          </component>
-          <component name="locfiles_set8" long-name="Locale Files Set 8" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set8"/>
-          </component>
-          <component name="locfiles_set9" long-name="Locale Files Set 9" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set9"/>
-          </component>
-          <component name="locfiles_set10" long-name="Locale Files Set 10" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set10"/>
-          </component>
-          <component name="locfiles_set11" long-name="Locale Files Set 11" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set11"/>
-          </component>
-          <component name="locfiles_set12" long-name="Locale Files Set 12" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set12"/>
-          </component>
-          <component name="locfiles_set13" long-name="Locale Files Set 13" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set13"/>
-          </component>
-          <component name="locfiles_set14" long-name="Locale Files Set 14" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set14"/>
-          </component>
-          <component name="locfiles_set15" long-name="Locale Files Set 15" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set15"/>
-          </component>
-          <component name="locfiles_set16" long-name="Locale Files Set 16" filter="s60" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/locfiles/group/set16"/>
-          </component>
-        </collection>
         <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">
@@ -156,6 +101,12 @@
             <!-- will shoudl give the id/path something more unique than cenrep -->
             <unit bldFile="/sf/os/deviceplatformrelease/sf_config/cenrep/group"/>
           </component>
+          <component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+          </component>
+          <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
+            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+          </component>
         </collection>
         <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/deviceplatformrelease/package_definition_3.0.xml
--- a/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -7,61 +7,6 @@
         <unit bldFile="S60Extras/group"/>
       </component>
     </collection>
-    <collection id="locfiles" name="Locale Files" level="mid">
-      <component id="locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
-      	<!-- need to move component down a directory -->
-        <unit bldFile="locfiles/group"/>
-      </component>
-	<component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set1"/>
-	</component>
-	<component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set2"/>
-	</component>
-	<component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set3"/>
-	</component>
-	<component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set4"/>
-	</component>
-	<component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set5"/>
-	</component>
-	<component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set6"/>
-	</component>
-	<!-- is the a problem with SF builds with the following? -->
-	<component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set7"/>
-	</component>
-	<component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set8"/>
-	</component>
-	<component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set9"/>
-	</component>
-	<component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set10"/>
-	</component>
-	<component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set11"/>
-	</component>
-	<component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set12"/>
-	</component>
-	<component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set13"/>
-	</component>
-	<component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set14"/>
-	</component>
-	<component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set15"/>
-	</component>
-	<component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
-		<unit bldFile="locfiles/group/set16"/>
-	</component>      
-    </collection>
     <collection id="version" name="Version" level="top">
     	<!-- collection is really a component. Need to move down a directory -->    
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
@@ -84,6 +29,12 @@
 		<!-- will shoudl give the id/path something more unique than cenrep -->
         <unit bldFile="sf_config/cenrep/group"/>
       </component>
+      <component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="sf_config/rombuild/syborg/group"/>
+      </component>
+      <component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="sf_config/rombuild/zoom2/group"/>
+      </component>
     </collection>
         <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/devicesrv/package_definition_3.0.xml
--- a/symbian4/os/devicesrv/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -286,9 +286,15 @@
     <unit bldFile="commonservices/platformenv/group"/>
    </component>
    <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+    </meta>
     <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
    </component>
    <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+      <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
+    </meta>
     <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
    </component>
   </collection>
@@ -408,11 +414,20 @@
     <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
    </component>
    <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
     <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
    </component>
    <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+    <meta rel="config">
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
     <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
    </component>
+    <meta rel="config">
+      <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
+    </meta>
    <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
     <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
    </component>
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -137,14 +137,6 @@
             <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
             <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
           </component>
-          <component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
-            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-          </component>
-          <component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
-            <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-            <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-          </component>
         </collection>
         <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
           <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/kernelhwsrv/package_definition_3.0.xml
--- a/symbian4/os/kernelhwsrv/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -61,14 +61,6 @@
         <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
         <unit bldFile="kernel/eka/drivers/usbc" mrp="kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
       </component>
-      <component id="usbdescriptors" name="USB Descriptors" purpose="optional">
-        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/usbho/usbdescriptors" mrp="kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
-      </component>
-      <component id="usbdi_utils" name="USB DI Utils" purpose="optional">
-        <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
-        <unit bldFile="kernel/eka/drivers/usbho/usbdi_utils" mrp="kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
-      </component>
     </collection>
     <collection id="driversupport" name="Generic Driver Support" level="hw-if">
       <component id="mediadrivers" name="Media Drivers" purpose="optional">
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/ossrv/package_definition_3.0.xml
--- a/symbian4/os/ossrv/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/ossrv/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+  <package id="ossrv" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
   <collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
    <component id="boost_apis" name="Boost APIs" class="api" filter="s60">
     <meta rel="Api" href="ossrv_pub/boost_apis/boost_apis.metaxml"/>
@@ -362,140 +362,137 @@
     <unit bldFile="ossrv_plat/libutils/group"/>
    </component>
   </collection>
-  <collection id="stdlibs" name="Standard Libraries" level="translation">
-   <component id="libz" filter="s60" name="Z Compression Library">
-    <unit bldFile="stdlibs/libz/group"/>
-   </component>
-   <component id="libcrypt" filter="s60" name="Crypt Library">
-    <unit bldFile="stdlibs/libcrypt/group"/>
-   </component>
-  </collection>
-  <collection id="ssl" name="SSL" level="data-services">
-   <component id="libcrypto" filter="s60" name="Crypto Library">
-    <unit bldFile="ssl/libcrypto/group"/>
-   </component>
-   <component id="libssl" filter="s60" purpose="development" name="SSL Library">
-    <unit bldFile="ssl/libssl/group"/>
-   </component>
-  </collection>
-  <collection id="glib" name="GLib" level="utilities">
-   <component id="glibbackend" filter="s60" name="GLib Backend">
-    <unit bldFile="glib/build/symbian/glibbackend/group"/>
-    <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
-   </component>
-   <component id="libglib" filter="s60" name="GLib Library">
-    <unit bldFile="glib/build/symbian/glib/group"/>
-    <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
-   </component>
-   <component id="libgthread" filter="s60" name="Libg Thread">
-    <unit bldFile="glib/build/symbian/gthread/group"/>
-    <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
-   </component>
-   <component id="libgmodule" filter="s60" name="Libg Module">
-    <unit bldFile="glib/build/symbian/gmodule/group"/>
-    <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
-   </component>
-   <component id="libgobject" filter="s60" name="Libg Object">
-    <unit bldFile="glib/build/symbian/gobject/group"/>
-    <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
-   </component>
-  </collection>
-  <collection id="stdcpp" name="C++ Standard Library" level="translation">
-   <!-- collection is really a component. Needs to be moved down a directory -->
-   <component id="stdcpp_build" filter="s60" name="Stdcpp">
-    <unit bldFile="stdcpp/group"/>
-   </component>
-  </collection>
-  <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
-   <component id="dbus" filter="s60" name="D-Bus">
-    <unit bldFile="ofdbus/dbus/group"/>
-   </component>
-   <component id="dbus-glib" filter="s60" name="D-Bus GLib">
-    <unit bldFile="ofdbus/dbus-glib/group"/>
-   </component>
-   <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+    <collection id="stdlibs" name="Standard Libraries" level="translation">
+      <component id="libz" filter="s60" name="Z Compression Library">
+        <unit bldFile="stdlibs/libz/group"/>
+      </component>
+      <component id="libcrypt" filter="s60" name="Crypt Library">
+        <unit bldFile="stdlibs/libcrypt/group"/>
+      </component>
+    </collection>
+    <collection id="ssl" name="SSL" level="data-services">
+      <component id="libcrypto" filter="s60" name="Crypto Library">
+        <unit bldFile="ssl/libcrypto/group"/>
+      </component>
+      <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+        <unit bldFile="ssl/libssl/group"/>
+      </component>
+    </collection>
+    <collection id="glib" name="GLib" level="utilities">
+      <component id="glibbackend" filter="s60" name="GLib Backend">
+        <unit bldFile="glib/build/symbian/glibbackend/group"/>
+        <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+      </component>
+      <component id="libglib" filter="s60" name="GLib Library">
+        <unit bldFile="glib/build/symbian/glib/group"/>
+        <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+      </component>
+      <component id="libgthread" filter="s60" name="Libg Thread">
+        <unit bldFile="glib/build/symbian/gthread/group"/>
+        <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
+      </component>
+      <component id="libgmodule" filter="s60" name="Libg Module">
+        <unit bldFile="glib/build/symbian/gmodule/group"/>
+        <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
+      </component>
+      <component id="libgobject" filter="s60" name="Libg Object">
+        <unit bldFile="glib/build/symbian/gobject/group"/>
+        <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
+      </component>
+    </collection>
+    <collection id="stdcpp" name="C++ Standard Library" level="translation">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="stdcpp_build" filter="s60" name="Stdcpp">
+        <unit bldFile="stdcpp/group"/>
+      </component>
+    </collection>
+    <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+      <component id="dbus" filter="s60" name="D-Bus">
+        <unit bldFile="ofdbus/dbus/group"/>
+      </component>
+      <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+        <unit bldFile="ofdbus/dbus-glib/group"/>
+      </component>
+      <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
-    <unit bldFile="ofdbus/group"/>
-   </component>
-  </collection>
-  <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
-   <component id="libutils" filter="s60" name="Utility Library">
-    <unit bldFile="utilitylibraries/libutils/group"/>
-   </component>
-  </collection>
-  <collection id="genericservices" name="Generic Services" level="utilities">
-   <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
-    <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
-   </component>
-   <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
-    <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-   </component>
-   <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
-    <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-   </component>
-   <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
-    <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-   </component>
-   <component id="activebackupclient" name="Active Backup Client" purpose="optional">
-    <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-   </component>
-   <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
-    <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-   </component>
-   <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
-    <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-   </component>
-  </collection>
-  <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
-   <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
-    <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
-   </component>
-  </collection>
-  <collection id="compressionlibs" name="Compression Libraries" level="data-services">
-   <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
-    <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
-   </component>
-  </collection>
-  <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
-   <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
-    <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-   </component>
-   <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
-    <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
-   </component>
-   <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
-    <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
-   </component>
-   <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-    <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-   </component>
-   <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
-    <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
-   </component>
-   <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
-    <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-   </component>
-  </collection>
-  <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
-   <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
-    <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
-   </component>
-   <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
-    <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-   </component>
-   <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
-    <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
-   </component>
-  </collection>
-  <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
-   <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
-    <!-- exports should be moved to individual components -->
-    <unit bldFile="group"/>
-   </component>
-   <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-   </component>
-  </collection>
- </package>
+        <unit bldFile="ofdbus/group"/>
+      </component>
+    </collection>
+    <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+      <component id="libutils" filter="s60" name="Utility Library">
+        <unit bldFile="utilitylibraries/libutils/group"/>
+      </component>
+    </collection>
+    <collection id="genericservices" name="Generic Services" level="utilities">
+      <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+        <unit version="tb101sf" bldFile="genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+      </component>
+      <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+        <unit bldFile="genericservices/mimerecognitionfw/group" mrp="genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+      </component>
+      <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+        <unit bldFile="genericservices/systemagent/group" mrp="genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+      </component>
+      <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+        <unit bldFile="genericservices/taskscheduler/group" mrp="genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+      </component>
+      <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+        <unit bldFile="genericservices/activebackupclient/group" mrp="genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+      </component>
+      <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+        <unit mrp="genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+      </component>
+      <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+        <unit bldFile="genericservices/httputils/group" mrp="genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+      </component>
+    </collection>
+    <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+      <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+        <unit mrp="syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="syslibsapitest/syslibssvs/group"/>
+      </component>
+    </collection>
+    <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+      <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+        <unit bldFile="compressionlibs/ziplib/group" mrp="compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+      </component>
+    </collection>
+    <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+      <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+        <unit bldFile="genericopenlibs/cstdlib/group" mrp="genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+      </component>
+      <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+        <unit bldFile="genericopenlibs/cppstdlib/group" mrp="genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+      </component>
+      <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+        <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
+      </component>
+      <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+        <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+      </component>
+	  <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+        <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+      </component>
+    </collection>
+    <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+      <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+        <unit version="3" bldFile="lowlevellibsandfws/pluginfw/Group" mrp="lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+      </component>
+      <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+        <unit bldFile="lowlevellibsandfws/apputils/group" mrp="lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+      </component>
+      <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+        <unit bldFile="lowlevellibsandfws/genericusabilitylib/group" mrp="lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+      </component>
+    </collection>
+    <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+      <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+      <!-- exports should be moved to individual components -->
+        <unit bldFile="group"/>
+      </component>
+      <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/security/package_definition.xml
--- a/symbian4/os/security/package_definition.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/security/package_definition.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -147,10 +147,6 @@
           <component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
             <unit mrp="/sf/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
           </component>
-          <component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-            <!-- not in S60 codebase -->
-            <unit bldFile="/sf/os/security/cryptoservices/rootcertificates/group" mrp="/sf/os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-          </component>
           <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
             <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
           </component>
diff -r 2d3e0c71cfab -r 23977b7c7e58 symbian4/os/security/package_definition_3.0.xml
--- a/symbian4/os/security/package_definition_3.0.xml	Tue Apr 20 12:14:05 2010 +0100
+++ b/symbian4/os/security/package_definition_3.0.xml	Tue Apr 20 13:40:40 2010 +0100
@@ -71,10 +71,6 @@
       <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
         <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
       </component>
-      <component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
-        <!-- not in S60 codebase -->
-        <unit bldFile="cryptoservices/rootcertificates/group" mrp="cryptoservices/rootcertificates/group/rootcerts.mrp"/>
-      </component>
       <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
         <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
       </component>