diff -r e84a4b44b2e8 -r 78fbd574edf4 package_definition.xml
--- a/package_definition.xml	Fri Apr 16 15:55:43 2010 +0300
+++ b/package_definition.xml	Fri Jun 11 14:30:51 2010 +0300
@@ -2,20 +2,20 @@
 <SystemDefinition schema="3.0.0">
   <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
     <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
         <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
       </component>
     </collection>
     <collection id="upnp" name="UPnP" level="server">
-      <component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
+      <component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api" filter="s60">
         <unit bldFile="upnp/upnpstack_plat/group"/>
       </component>
-      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
         <unit bldFile="upnp/upnpstack/group"/>
       </component>
     </collection>
     <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop" filter="s60">
         <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
       </component>
     </collection>