--- a/symbian4/mw/uiresources/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,150 +50,145 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="uiresources" level="generic" levels="compile plugin framework server generic data" long-name="UI Resources">
+   <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
 <!-- are the custom filters below needed? -->
 <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-<component name="pictograph_api" long-name="Pictograph API" filter="s60" purpose="optional" class="api">
+<component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
 </component>
-<component name="skins_api" long-name="Skins API" filter="s60" purpose="optional" class="api">
+<component name="skins_api" long-name="Skins API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
 </component>
-<component name="font_definition_api" long-name="Font Definition API" filter="s60" purpose="optional" class="api">
+<component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
 </component>
-<component name="graphics_api" long-name="Graphics API" filter="s60" purpose="optional" class="api">
+<component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
 </component>
-<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" purpose="optional" class="api">
+<component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
 </component>
-<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" purpose="optional" class="api">
+<component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
 </component>
 </collection>
 <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" purpose="optional" class="api">
+<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
 </component>
-<component name="layout_data_api" long-name="Layout Data API" filter="s60" purpose="optional" class="api">
+<component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
 </component>
-<component name="cdl_api" long-name="CDL API" filter="s60" purpose="optional" class="api">
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
 </component>
-<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" purpose="optional" class="api">
+<component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
 </component>
-<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
 </component>
-<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" purpose="optional" class="api">
+<component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
 </component>
-<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" purpose="optional" class="api">
+<component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
 </component>
-<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" purpose="optional" class="api">
+<component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
 </component>
-<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" purpose="optional" class="api">
+<component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
 </component>
-<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" purpose="optional" class="api">
+<component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
 </component>
-<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" purpose="optional" class="api">
+<component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
 </component>
-<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" purpose="optional" class="api">
+<component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
 </component>
-<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" purpose="optional" class="api">
+<component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
 </component>
-<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" purpose="optional" class="api">
+<component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
 </component>
-<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" purpose="optional" class="api">
+<component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
 </component>
-<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" purpose="optional" class="api">
+<component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
 </component>
 </collection>
 <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-<component name="uiresources_test" long-name="UI Resources Tests" filter="s60,test,api_test" purpose="development"/>
+<component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
 </collection>
 <collection name="uigraphics" long-name="UI Graphics" level="generic">
-<component name="bitmaps2" long-name="Bitmaps 2" filter="s60" purpose="optional" class="config">
+<component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
 <unit bldFile="/sf/mw/uiresources/uigraphics/bitmaps2/group"/>
 </component>
-<component name="icons" long-name="Icons" filter="s60" purpose="optional" class="config">
+<component name="icons" filter="s60" long-name="Icons" class="config">
 <unit bldFile="/sf/mw/uiresources/uigraphics/icons/group"/>
 </component>
-<component name="variatedbitmaps" long-name="Variated Bitmaps" filter="s60" purpose="optional" class="config">
+<component name="variatedbitmaps" filter="s60" long-name="Variated Bitmaps" class="config">
 <unit bldFile="/sf/mw/uiresources/uigraphics/variatedbitmaps/group"/>
 </component>
-<component name="aknicon" long-name="Avkon Icon Framework" filter="s60" purpose="optional">
+<component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
 <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
 </component>
-<component name="nvgrenderstage" long-name="NVG Render Stage" filter="sf_build" purpose="optional">
+<component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
 <unit bldFile="/sf/mw/uiresources/uigraphics/nvgrenderstage/group"/>
 </component>
 </collection>
 <collection name="layouts" long-name="Layouts" level="plugin">
-<component name="cdl" long-name="Customization Definition Language" filter="s60" purpose="optional">
+<component name="cdl" filter="s60" long-name="Customization Definition Language">
 <!-- can only have one unit. Need to #include them or split into multiple components -->
 <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
 <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
 </component>
-<component name="aknlayout2" long-name="Avkon Layout 2" filter="s60" purpose="optional">
+<component name="aknlayout2" filter="s60" long-name="Avkon Layout 2">
 <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
 </component>
 </collection>
 <collection name="skins" long-name="Skins" level="data">
-<component name="aknskincontent" long-name="Avkon Skin Content" filter="s60" purpose="optional" class="config">
+<component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
 <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
 </component>
-<component name="aknskins" long-name="Avkon Skin Compiler" filter="s60" purpose="optional">
+<component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
 <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
 </component>
 </collection>
 <collection name="pictographs" long-name="Pictographs" level="data">
-<component name="aknpictograph" long-name="Avkon Pictograph" filter="s60" purpose="optional">
+<component name="aknpictograph" filter="s60" long-name="Avkon Pictograph">
 <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
 </component>
 </collection>
 <collection name="locales" long-name="Locales" level="framework">
-<component name="locales_build" long-name="Locales Build" filter="s60" purpose="optional">
+<component name="locales_build" filter="s60" long-name="Locales Build">
 <unit bldFile="/sf/mw/uiresources/locales/loce32"/>
 </component>
 </collection>
 <collection name="uiconfig" long-name="UI Config" level="server">
-<component name="s60config" long-name="S60 UI Config" filter="s60" purpose="optional">
+<component name="s60config" filter="s60" long-name="S60 UI Config">
 <unit bldFile="/sf/mw/uiresources/uiconfig/s60config/group"/>
 </component>
 </collection>
 <collection name="fontsupport" long-name="Font Support" level="generic">
-<component name="fontprovider" long-name="Font Provider" filter="s60" purpose="optional">
+<component name="fontprovider" filter="s60" long-name="Font Provider">
 <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
--->
-<component name="fontutils" long-name="Font Utils" filter="sf_build" purpose="optional">
+<component name="fontutils" long-name="Font Utils" filter="s60">
 <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
 </component>
 </collection>
 <collection name="helpthemes" long-name="Help Themes" level="data">
 <!-- collection is really a component. Need to move down a directory -->
-<component name="helpthemes_build" long-name="Help Themes Build" filter="s60" purpose="optional" class="config">
+<component name="helpthemes_build" filter="s60" long-name="Help Themes Build" class="config">
 <unit bldFile="/sf/mw/uiresources/helpthemes/group"/>
 </component>
 </collection>