--- a/tip_pbc/app/videoplayer/package_definition.xml	Thu Aug 19 18:51:41 2010 +0100
+++ b/tip_pbc/app/videoplayer/package_definition.xml	Thu Aug 19 18:52:09 2010 +0100
@@ -50,56 +50,56 @@
   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="app" long-name="Applications" levels="services apps">
-   <block name="videoplayer" level="apps" levels="support plugin util apps" long-name="Video Player Apps">
+   <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
 <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" purpose="optional" class="api">
+<component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
 <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
 </component>
-<component name="videocollection_api" long-name="Video Collection API" filter="s60" purpose="optional" class="api">
+<component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
 <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
 </component>
 </collection>
 <collection name="videocollection" long-name="Video Collection" level="util">
-<component name="mpxmyvideoscollection" long-name="MPX My Videos Collection" introduced="^3" filter="s60" purpose="optional">
+<component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
 <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group" filter="!test"/>
 </component>
-<component name="videocollectionwrapper" long-name="Video Collection Wrapper" introduced="^4" filter="s60" purpose="optional">
+<component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
 <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
 </component>
-<component name="videocollectionview" long-name="Video Collection View" introduced="^4" filter="s60" purpose="optional">
+<component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
 <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
 </component>
-<component name="videofiledetailsview" long-name="Video File Details View" introduced="^4" filter="s60" purpose="optional">
+<component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
 <unit bldFile="/sf/app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="mediasettings" long-name="Media Settings" level="support">
-<component name="mediasettingsengine" long-name="Media Settings Engine" filter="s60" purpose="optional">
+<component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
 <unit bldFile="/sf/app/videoplayer/mediasettings/mediasettingsengine/group"/>
 </component>
-<component name="videosettingsplugin" long-name="Video Settings Plugin" filter="s60" purpose="optional" plugin="Y">
+<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/mediasettings/videosettingsplugin" proFile="videosettingsplugin.pro"/>
 </component>
 </collection>
 <collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<component name="videoplayerengine" long-name="Video Player Engine" introduced="^4" filter="s60" purpose="optional">
+<component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
 <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
 </component>
-<component name="hbvideoplayer" long-name="Video Player" introduced="^4" filter="s60" purpose="optional">
+<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
 <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<component name="hbvideoplaybackview" long-name="HB Video Playback View" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
 </component>
-<component name="hbvideoplaybackviewplugin" long-name="HB Video Playback View Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
+<component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
 </component>
-<component name="videohelix" long-name="Video Helix" introduced="^3" filter="s60" purpose="optional" plugin="Y">
+<component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
 <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
 </component>
 </collection>