--- a/symbian4/mw/camerasrv/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Mon Sep 06 15:26:01 2010 +0100
@@ -50,40 +50,40 @@
   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="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+   <block name="camerasrv" level="specific" levels="plugin fw api" long-name="Camera Services">
 <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+<component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
 </component>
-<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+<component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
 </component>
-<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+<component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
 </component>
-<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+<component name="media_recorder_api" long-name="Media Recorder API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
 </component>
-<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" purpose="optional" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
 </component>
 </collection>
 <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
 <!-- collection is really a component. Should move down a directory -->
-<component name="camcordermmfplugin_build" filter="s60" long-name="Camcorder MMF Plugin Build" plugin="Y">
+<component name="camcordermmfplugin_build" long-name="Camcorder MMF Plugin Build" filter="s60" purpose="optional" plugin="Y">
 <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
 </component>
 </collection>
 <collection name="configmanagers" long-name="Config Managers" level="api">
-<component name="imagingconfigmanager" filter="s60" long-name="Imaging Config Manager">
+<component name="imagingconfigmanager" long-name="Imaging Config Manager" filter="s60" purpose="optional">
 <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
 </component>
 </collection>
 <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-<component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
+<component name="camerasrv_build" long-name="Camera Services Build" filter="s60" purpose="optional">
 <!-- should split into individual bld.infs -->
 <unit bldFile="/sf/mw/camerasrv/group"/>
 </component>