--- a/tip_pbc/app/contacts/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/app/contacts/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,55 +50,55 @@
   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="contacts" level="apps" span="2" levels="engine support services plugin ui" long-name="Contacts Apps">
+   <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services plugin ui">
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" introduced="^4" filter="s60" purpose="optional" class="api"/>
+<component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
 </collection>
 <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="cnthistorymodel" long-name="Contacts History Model" introduced="^4" filter="s60" purpose="optional" class="placeholder">
+<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
 <!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
 </component>
-<component name="pbkcommonui" long-name="Phonebook Common UI" introduced="^4" filter="s60" purpose="optional" class="placeholder">
+<component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
 </component>
-<component name="phonebookapp" long-name="Phonebook Application" introduced="^4" filter="s60" purpose="optional" class="placeholder">
+<component name="phonebookapp" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
 <!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
 </component>
-<component name="phonebookservices" long-name="Phonebook Services" introduced="^4" filter="s60" purpose="optional" class="placeholder">
+<component name="phonebookservices" filter="s60" long-name="Phonebook Services" introduced="^4" class="placeholder">
 <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
 </component>
-<component name="phonebookui_build" long-name="Phonebook UI Build" introduced="^4" filter="s60" purpose="optional">
+<component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
 <!-- break up into components -->
 <unit bldFile="/sf/app/contacts/phonebookui" proFile="phonebookui.pro"/>
 </component>
 </collection>
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="cntfindplugin" long-name="Contacts Find Plugin" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
-<component name="cntsortplugin" long-name="Contacts Sort Plugin" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="qtcontactsmobility" long-name="Qt Contacts Mobility" introduced="^4" filter="s60" purpose="optional" plugin="Y" class="placeholder">
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y" class="placeholder">
 <!-- need to move to this actual dir rather than including something from another collection -->
 <!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
 </component>
-<component name="cntlistmodel" long-name="Contact List Model" introduced="^4" filter="s60" purpose="optional">
+<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
 </component>
-<component name="cntactions" long-name="Contacts Actions" introduced="^4" filter="s60" purpose="optional">
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
 </component>
-<component name="cntmaptileservice" long-name="Contacts Map Tile Service" introduced="^4" filter="s60" purpose="optional">
+<component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="cntsimutility" long-name="Contacts SIM Utility" introduced="^4" filter="s60" purpose="optional">
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
 </component>
-<component name="cntimageutility" long-name="Contacts Image Utility" introduced="^4" filter="s60" purpose="optional">
+<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
 <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
 </component>
 </collection>
@@ -106,21 +106,21 @@
 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
 <unit bldFile="/sf/app/contacts/pimprotocols/phonebooksync/group" mrp="/sf/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
 </component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" filter="s60" purpose="optional">
+<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
 <unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
 </component>
 </collection>
 <collection name="presencecache" long-name="Presence Cache" level="support">
-<component name="presencecachesymbian" long-name="Presence Cache Symbian" introduced="^4" filter="s60" purpose="optional">
+<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
 <unit bldFile="/sf/app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
 </component>
-<component name="presencecacheqt" long-name="Presence Cache Qt" introduced="^4" filter="s60" purpose="optional">
+<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
 <unit bldFile="/sf/app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
 </component>
 </collection>
 <collection name="contactwidgethsplugin" long-name="Contact Widget Homescreen Plugin" level="plugin">
 <!-- collection is really a component, move down a directory -->
-<component name="contactwidgethsplugin_build" long-name="Contact Widget Homescreen Plugin Build" introduced="^4" purpose="optional">
+<component name="contactwidgethsplugin_build" long-name="Contact Widget Homescreen Plugin Build" introduced="^4">
 <unit bldFile="/sf/app/contacts/contactwidgethsplugin" proFile="contactwidgethsplugin.pro"/>
 </component>
 </collection>