--- a/symbian4/app/imgeditor/package_definition.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml	Wed May 19 10:37:39 2010 +0100
@@ -78,39 +78,39 @@
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
         <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-          <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+          <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="sf_build" class="api">
             <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
           </component>
-          <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+          <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="sf_build" class="api">
             <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
           </component>
-          <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+          <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="sf_build" class="api">
             <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
           </component>
-          <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+          <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="sf_build" class="api">
             <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
           </component>
-          <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+          <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="sf_build" class="api">
             <unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
           </component>
         </collection>
         <collection name="imageeditor" long-name="Image Editor UI" level="ui">
-          <component name="pb" filter="s60" long-name="Plugin Base">
+          <component name="pb" filter="sf_build" long-name="Plugin Base">
             <unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
           </component>
-          <component name="iepb" filter="s60" long-name="Image Editor Plugin Base">
+          <component name="iepb" filter="sf_build" long-name="Image Editor Plugin Base">
             <unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
           </component>
-          <component name="imageeditorui" filter="s60" long-name="Image Editor UI">
+          <component name="imageeditorui" filter="sf_build" long-name="Image Editor UI">
             <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
           </component>
-          <component name="imageeditormanager" filter="s60" long-name="Image Editor Manager">
+          <component name="imageeditormanager" filter="sf_build" long-name="Image Editor Manager">
             <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
           </component>
-          <component name="imageeditorapp" filter="s60" long-name="Image Editor Application">
+          <component name="imageeditorapp" filter="sf_build" long-name="Image Editor Application">
             <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
           </component>
-          <component name="imageeditor_plugins" filter="s60" long-name="Image Editor Plugins" plugin="Y">
+          <component name="imageeditor_plugins" filter="sf_build" long-name="Image Editor Plugins" plugin="Y">
             <!-- can only have one unit. Need to include all from a single bld.inf -->
             <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
             <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
@@ -133,16 +133,16 @@
         <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
           </component>
-          <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
+          <component name="editorprovider" filter="sf_build" long-name="Image Editor Provider">
             <unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
           </component>
-          <component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+          <component name="imageeditor_build" filter="sf_build" long-name="Image Editor Build">
             <!-- should distribute this to the other components -->
             <unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
           </component>
         </collection>
         <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-          <component name="filters" filter="s60" long-name="Image Editor Filters">
+          <component name="filters" filter="sf_build" long-name="Image Editor Filters">
             <!-- can only have one unit. Need to include all from a single bld.inf -->
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
@@ -168,16 +168,16 @@
         <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
           </component>
-          <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
+          <component name="imageeditorutils" filter="sf_build" long-name="Image Editor Utilities">
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
           </component>
-          <component name="systemparameters" filter="s60" long-name="System Parameters">
+          <component name="systemparameters" filter="sf_build" long-name="System Parameters">
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
           </component>
-          <component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
+          <component name="enginewrapper" filter="sf_build" long-name="Image Editor Engine Wrapper">
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
           </component>
-          <component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+          <component name="imageeditorengine_build" filter="sf_build" long-name="Image Editor Engine Build">
             <!-- should distribute this to the other components -->
             <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
           </component>