--- a/package_definition.xml	Mon Jul 19 14:53:33 2010 +0100
+++ b/package_definition.xml	Wed Jul 21 17:41:03 2010 +0100
@@ -8,9 +8,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">
@@ -39,6 +36,9 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
+      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP Context UMTS Driver" introduced="8.1" deprecated="^3" purpose="optional" filter="test">
+        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+      </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
         <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
       </component>
@@ -70,7 +70,7 @@
       <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
       </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
         <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
       </component>
       <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
@@ -86,14 +86,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"/>
@@ -106,9 +98,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>