--- a/symbian4/os/devicesrv/package_definition.xml	Sat Jul 03 23:33:53 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Tue Jul 13 18:04:28 2010 +0100
@@ -56,6 +56,7 @@
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<!-- this needs to be moved to deviceplatformrelease -->
 <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
 </component>
 <component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
@@ -367,7 +368,7 @@
 <!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
 </component>
-<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" filter="s60">
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
 </component>
 </collection>