--- a/symbian4/mw/imghandling/package_definition.xml	Thu Sep 09 10:32:56 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Thu Sep 09 14:03:04 2010 +0100
@@ -50,32 +50,32 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+   <block name="imghandling" level="specific" levels="lib util if" long-name="Image Handling">
 <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
-<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+<component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
 </component>
-<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+<component name="3gp_library_api" long-name="3GP Library API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
 </component>
-<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+<component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
 </component>
 </collection>
 <collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
 <!-- collection is really a component, need to move down a directory -->
-<component name="ihl" filter="s60" long-name="IHL">
+<component name="ihl" long-name="IHL" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
 </component>
 </collection>
 <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
+<component name="thumbnailmanager" long-name="Thumbnail Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
 </component>
-<component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
+<component name="thumbnailmanagerqt" long-name="Thumbnail Manager Qt" introduced="^4" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
 </component>
 </collection>