diff -r 13018254ec2a -r 9e7a463cb657 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Mon Jul 19 19:03:29 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
@@ -50,71 +50,71 @@
   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="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+   <block name="homescreensrv" level="specific" levels="plugin framework server generic specific" long-name="Home Screen Services">
 <collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
-<component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
+<component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/hswidgetmodel" proFile="hswidgetmodel.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="contentstorage" long-name="Content Storage" level="framework">
-<component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
+<component name="cautils" long-name="Content Arsenal Utils" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils" proFile="cautils.pro" qmakeArgs="-r"/>
 </component>
-<component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
+<component name="contentstorage_build" long-name="Content Storage Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/group" proFile="group.pro" qmakeArgs="-r"/>
 </component>
-<component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
+<component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" proFile="calocalizerscanner.pro" qmakeArgs="-r"/>
 </component>
-<component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
+<component name="cahandler" long-name="Content Arsenal Handler" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler" proFile="cahandler.pro" qmakeArgs="-r"/>
 </component>
-<component name="caclient" long-name="Content Arsenal Client" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
+<component name="caclient" long-name="Content Arsenal Client" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient" proFile="caclient.pro" qmakeArgs="-r"/>
 </component>
-<component name="casoftwareregistry" long-name="Content Arsenal Software Registry" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/contentstorage/casoftwareregistry" qmakeArgs="-r" proFile="casoftwareregistry.pro"/>
+<component name="casoftwareregistry" long-name="Content Arsenal Software Registry" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/contentstorage/casoftwareregistry" proFile="casoftwareregistry.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
+<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat" proFile="homescreensrv_plat.pro" qmakeArgs="-r"/>
 </component>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
-<component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
-<component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
-<component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" purpose="optional" class="api"/>
+<component name="contentstorage_api" long-name="Content Storage API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="hswidgetmodel_api" long-name="HS Widget Model API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="homescreen_information_api" long-name="Homescreen Information API" introduced="^4" filter="s60" purpose="optional" class="api"/>
 </collection>
 <collection name="hsactivityfw" long-name="Activity Framework" level="fw">
-<component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
+<component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/activityfw" proFile="activityfw.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
 <!-- move collection down to a component directory or split up into component .pro files -->
-<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/tstaskmonitor" qmakeArgs="-r" proFile="tstaskmonitor.pro"/>
+<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/tstaskmonitor" proFile="tstaskmonitor.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
-<component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
-<unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
+<component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler" proFile="hsappkeyhandler.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="tsdevicedialog" long-name="Task Switcher Device Dialog" level="plugin">
-<component name="tsdevicedialog_build" long-name="Task Switcher Device Dialog Build" introduced="^4">
+<component name="tsdevicedialog_build" long-name="Task Switcher Device Dialog Build" introduced="^4" purpose="optional">
 <!-- break this up into real components -->
-<unit bldFile="/sf/mw/homescreensrv/tsdevicedialog" qmakeArgs="-r" proFile="tsdevicedialog.pro"/>
+<unit bldFile="/sf/mw/homescreensrv/tsdevicedialog" proFile="tsdevicedialog.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
-<component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
-<unit bldFile="/sf/mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
+<component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" purpose="optional" class="config">
+<unit bldFile="/sf/mw/homescreensrv/." proFile="homescreensrv_exports_to_rom.pri" qmakeArgs="-r"/>
 </component>
-<component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
+<component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4" purpose="optional">
 <unit bldFile="/sf/mw/homescreensrv/group"/>
 </component>
 </collection>