# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266840286 0
# Node ID 519ca14792dbee1dd48162d5f6da36e2635c7eb0
# Parent  721a01044a1b893919380c8386d28be4ac315162
Remove units for removed or non-contributed bld.infs

diff -r 721a01044a1b -r 519ca14792db symbian3/os/buildtools/package_definition.xml
--- a/symbian3/os/buildtools/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/buildtools/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -81,21 +81,10 @@
           <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
             <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
           </component>
-          <component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development">
-            <unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
-          </component>
           <component name="commonbldutils" long-name="Common Utils" purpose="development">
             <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
           </component>
         </collection>
-        <collection name="packaging" long-name="Packaging" level="ui">
-          <component name="additionalutils" long-name="Additional Utils" purpose="development">
-            <unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
-          </component>
-          <component name="dummy" long-name="Dummy" purpose="development">
-            <unit bldFile="/sf/os/buildtools/packaging/dummy" mrp="/sf/os/buildtools/packaging/dummy/additional_dummy.mrp"/>
-          </component>
-        </collection>
         <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
           <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
             <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
@@ -103,15 +92,6 @@
           <component name="e32tools" long-name="E32 Tools" deprecated="^2" purpose="development" class="PC">
             <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
           </component>
-          <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" filter="test">
-            <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="/sf/os/buildtools/dist_os/redistributionwinceka2"/>
-          </component>
-          <component name="additionalredistribution" long-name="Additional Redistribution" purpose="development" filter="test">
-            <unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution"/>
-          </component>
-          <component name="statapi" long-name="STAT API" filter="gt" purpose="development">
-            <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-          </component>
           <component name="wintunnel" long-name="Wintunnel" purpose="development" filter="test">
             <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/sf/os/buildtools/toolsandutils/wintunnel/group"/>
           </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/buildtools/package_definition_3.0.xml
--- a/symbian3/os/buildtools/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/buildtools/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -5,21 +5,10 @@
       <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
         <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
       </component>
-      <component id="gttechviewbaseline" name="GT Techview Baseline" purpose="development">
-        <unit mrp="packaging/additionalutils/gt_techview_baseline.mrp"/>
-      </component>
       <component id="commonbldutils" name="Common Utils" purpose="development">
         <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
       </component>
     </collection>
-    <collection id="packaging" name="Packaging" level="ui">
-      <component id="additionalutils" name="Additional Utils" purpose="development">
-        <unit mrp="packaging/additionalutils/additional_unknown_cedar.mrp"/>
-      </component>
-      <component id="dummy" name="Dummy" purpose="development">
-        <unit bldFile="packaging/dummy" mrp="packaging/dummy/additional_dummy.mrp"/>
-      </component>
-    </collection>
     <collection id="toolsandutils" name="Tools and Utils" level="mw">
       <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
         <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
@@ -27,15 +16,6 @@
       <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
         <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
       </component>
-      <component id="wincredistribution" name="WinC Redistribution" purpose="development" filter="test">
-        <unit mrp="dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="dist_os/redistributionwinceka2"/>
-      </component>
-      <component id="additionalredistribution" name="Additional Redistribution" purpose="development" filter="test">
-        <unit mrp="perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="perltoolsplat_os/redistribution"/>
-      </component>
-      <component id="statapi" name="STAT API" filter="gt" purpose="development">
-        <unit bldFile="toolsandutils/statapi/source/statapi/console" mrp="toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-      </component>
       <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
         <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
       </component>
@@ -47,8 +27,8 @@
       <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
         <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
       </component>
-	  </collection>
-	  <collection id="imgtools_os" name="Image Tools" level="fw">
+	 </collection>
+	 <collection id="imgtools_os" name="Image Tools" level="fw">
       <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
         <unit bldFile="imgtools_os/romkiteka2/group" mrp="imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
       </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/cellularsrv/package_definition.xml
--- a/symbian3/os/cellularsrv/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -81,9 +81,6 @@
           <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
             <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
           </component>
-          <component name="isc_if" filter="s60" long-name="Inter-System Communication Interface">
-            <unit bldFile="/sf/os/cellularsrv/basebandabstraction/isc_if/group"/>
-          </component>
         </collection>
         <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
           <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
@@ -166,14 +163,6 @@
             <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
           </component>
         </collection>
-        <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
-          <component name="gennif" filter="s60" long-name="Generic NIF">
-            <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gennif/group"/>
-          </component>
-          <component name="gprsumtsagent" filter="s60" long-name="GPRS UMTS Agent">
-            <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
-          </component>
-        </collection>
         <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
           <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
             <unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -186,9 +175,6 @@
           </component>
         </collection>
         <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-          <component name="cellularsrv_plat" filter="s60" long-name="Cellular Baseband Services Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/cellularsrv/cellularsrv_plat/group"/>
-          </component>
           <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc">
             <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
           </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/cellularsrv/package_definition_3.0.xml
--- a/symbian3/os/cellularsrv/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -5,9 +5,6 @@
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
-      <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
-        <unit bldFile="basebandabstraction/isc_if/group"/>
-      </component>
     </collection>
     <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
@@ -90,14 +87,6 @@
         <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
       </component>
     </collection>
-    <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
-      <component id="gennif" filter="s60" name="Generic NIF">
-        <unit bldFile="commonnetworkinterface/gennif/group"/>
-      </component>
-      <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
-        <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
-      </component>
-    </collection>
     <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
       <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
         <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -110,9 +99,6 @@
       </component>
     </collection>
     <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
-      <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
-        <unit bldFile="cellularsrv_plat/group"/>
-      </component>
       <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
         <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
       </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/devicesrv/package_definition.xml
--- a/symbian3/os/devicesrv/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -205,12 +205,6 @@
           </component>
         </collection>
         <collection name="sysstatemgmt" long-name="System State Management" level="server">
-          <component name="starter" filter="s60" long-name="Starter">
-            <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
-            <!-- are these test bld.infs needed for the build? -->
-            <!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
-            <!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
-          </component>
           <component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
             <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
           </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/devicesrv/package_definition_3.0.xml
--- a/symbian3/os/devicesrv/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -132,12 +132,6 @@
       </component>
     </collection>
 	<collection id="sysstatemgmt" name="System State Management" level="server">
-      <component id="starter" filter="s60" name="Starter">
-        <unit bldFile="sysstatemgmt/starter/group"/>
-         <!-- are these test bld.infs needed for the build? -->
-        <!-- <unit bldFile="sysstatemgmt/starter/strtsecnote/group"/> -->
-        <!-- <unit bldFile="sysstatemgmt/starter/strtsecobs/group"/> -->
-      </component>
       <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
         <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
       </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/graphics/package_definition.xml
--- a/symbian3/os/graphics/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/graphics/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -78,12 +78,6 @@
     <layer name="os" long-name="OS" levels="hw services">
       <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
         <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
-          <component name="3d_opengl_es_1_1" filter="s60" long-name="3D OpenGL ES 1.1" introduced="^3">
-            <unit bldFile="/sf/os/graphics/graphicsaccelaration/3d_opengl_es_1_1/group"/>
-          </component>
-          <component name="2d_openvg_1_1" filter="s60" long-name="2D OpenVG 1.1" introduced="^3">
-            <unit bldFile="/sf/os/graphics/graphicsaccelaration/2D_OpenVG_1_1/group"/>
-          </component>
           <component name="vgi" filter="s60" long-name="VGI">
             <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
           </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/graphics/package_definition_3.0.xml
--- a/symbian3/os/graphics/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -2,12 +2,6 @@
 <SystemDefinition schema="3.0.0">
   <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
-      <component id="3d_opengl_es_1_1" filter="s60" name="3D OpenGL ES 1.1" introduced="^3">
-        <unit bldFile="graphicsaccelaration/3d_opengl_es_1_1/group"/>
-      </component>
-      <component id="2d_openvg_1_1" filter="s60" name="2D OpenVG 1.1" introduced="^3">
-        <unit bldFile="graphicsaccelaration/2D_OpenVG_1_1/group"/>
-      </component>
       <component id="vgi" filter="s60" name="VGI">
         <unit bldFile="graphicsaccelaration/vgi/group"/>
       </component>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -96,13 +96,6 @@
           <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
             <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
           </component>
-          <component name="npeintegmodule" long-name="NPE Integration Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/npeintegmodule/group" mrp="/sf/os/lbs/datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
-          </component>
-          <component name="datasourcemodules_build" long-name="Data Source Modules Build" introduced="^3" purpose="optional" filter="s60">
-            <!-- need to move the exports to another component, or make this a real component by removing the #include and moving down a directory -->
-            <unit bldFile="/sf/os/lbs/datasourcemodules/group"/>
-          </component>
         </collection>
         <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
           <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
diff -r 721a01044a1b -r 519ca14792db symbian3/os/lbs/package_definition_3.0.xml
--- a/symbian3/os/lbs/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/lbs/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -20,13 +20,6 @@
       <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
         <unit bldFile="datasourcemodules/locationapesuplpsy/group"/>
       </component>
-      <component id="npeintegmodule" name="NPE Integration Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/npeintegmodule/group" mrp="datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
-      </component>
-      <component id="datasourcemodules_build" name="Data Source Modules Build" introduced="^3" purpose="optional" filter="s60">
-      	<!-- need to move the exports to another component, or make this a real component by removing the #include and moving down a directory -->
-        <unit bldFile="datasourcemodules/group"/>
-      </component>
     </collection>
     <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
       <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
diff -r 721a01044a1b -r 519ca14792db symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -95,7 +95,7 @@
           </component>
           <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
             <!-- need to #include the lot from a single bld.inf
-      		Also move to a stanard component location, not under effectspresets -->
+      		Also move to a standard component location, not under effectspresets -->
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
@@ -120,15 +120,9 @@
           </component>
         </collection>
         <collection name="mdfdevvideoextensions" long-name="MDF Dev Video Extensions" level="device-fw">
-          <component name="arm_mdf_postprocessor" filter="s60" long-name="ARM MDF Postprocessor">
-            <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
-          </component>
           <component name="nga_mdf_postprocessor" long-name="NGA MDF Postprocessor" filter="s60">
             <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
           </component>
-          <component name="nga_mdf_tsrc" long-name="NGA MDF Tests" purpose="development" filter="s60,test,pref_test,module_test">
-            <unit bldFile="/sf/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
-          </component>
         </collection>
         <collection name="audio" long-name="Audio Codecs" level="middleware">
           <component name="arm_cmmf_codecs" filter="s60" long-name="ARM CMMF Codecs" plugin="Y">
@@ -138,11 +132,6 @@
         <collection name="video" long-name="Video Codecs" level="middleware">
           <!-- empty -->
         </collection>
-        <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-          <component name="postingsurface" filter="s60" long-name="Posting Surface">
-            <unit bldFile="/sf/os/mm/videoadaptationextensions/postingsurface/group"/>
-          </component>
-        </collection>
         <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
           <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
             <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/mm/package_definition_3.0.xml
--- a/symbian3/os/mm/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -19,7 +19,7 @@
       </component>
       <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
       	<!-- need to #include the lot from a single bld.inf
-      		Also move to a stanard component location, not under effectspresets -->
+      		Also move to a standard component location, not under effectspresets -->
 	    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 		<unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
 		<unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
@@ -44,15 +44,9 @@
       </component>
     </collection>
     <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
-      <component id="arm_mdf_postprocessor" filter="s60" name="ARM MDF Postprocessor">
-        <unit bldFile="mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
-      </component>
       <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
         <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
       </component>
-      <component id="nga_mdf_tsrc" name="NGA MDF Tests" purpose="development" filter="s60,test,pref_test,module_test">
-        <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/tsrc/StifNgaMdfPoPTest/group"/>
-      </component>
     </collection>
     <collection id="audio" name="Audio Codecs" level="middleware">
       <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
@@ -62,11 +56,6 @@
     <collection id="video" name="Video Codecs" level="middleware">
     	<!-- empty -->
     </collection>
-    <collection id="videoadaptationextensions" name="Video Adaptation Extensions" level="adaptation">
-      <component id="postingsurface" filter="s60" name="Posting Surface">
-        <unit bldFile="videoadaptationextensions/postingsurface/group"/>
-      </component>
-    </collection>
     <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
       <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
         <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/networkingsrv/package_definition.xml
--- a/symbian3/os/networkingsrv/package_definition.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -77,11 +77,6 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="commsdb" long-name="Comms DB" level="server">
-          <component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
-            <unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
-          </component>
-        </collection>
         <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
           <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
             <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
diff -r 721a01044a1b -r 519ca14792db symbian3/os/networkingsrv/package_definition_3.0.xml
--- a/symbian3/os/networkingsrv/package_definition_3.0.xml	Mon Feb 22 10:47:00 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml	Mon Feb 22 12:04:46 2010 +0000
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="commsdb" name="Comms DB" level="server">
-      <component id="s60_commsdb" filter="s60" name="S60 Commsdb" class="config">
-        <unit bldFile="commsdb/s60_commsdb/group"/>
-      </component>
-    </collection>
     <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
       <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
         <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -89,9 +84,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>