--- a/symbian4/adaptation/beagleboard/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
-<collection name="omap3530" long-name="OMAP 3530" level="hw-if">
-<component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
-</component>
-<component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
-</component>
-<component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/adaptation/qemu/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
-<collection name="qemu_baseport" long-name="Baseport" level="hw-if">
-<component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/adaptation/stubs/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-<component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-</component>
-<component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-</component>
-</collection>
-<collection name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub" level="adaptation">
-<component name="btaudioadaptation_stub_build" long-name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-</component>
-</collection>
-<collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-<component name="drm_stubs_build" long-name="DRM Stubs Build">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-</component>
-</collection>
-<collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-<component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-</component>
-</collection>
-<collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-<component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-</component>
-</collection>
-<collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
-<component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-</component>
-</collection>
-<collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-<component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-</component>
-</collection>
-<collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-<component name="power_save_display_mode_stub_build" long-name="Power Save Display Mode Stub Build">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
-<component name="ddcaccessstub" long-name="DDC Access Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
-</component>
-<component name="tvoutconfig" long-name="TV Out Config">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
-</component>
-<component name="accessorypolicyreference" long-name="Accessory Policy Reference">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
-</component>
-<component name="asyreference" long-name="ASY Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
-</component>
-<component name="examplecommonisc" long-name="Example Common ISC">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
-</component>
-<component name="exampledsy" long-name="Example DSY">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
-</component>
-<component name="featuremanagerstub" long-name="Feature Manager Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
-</component>
-<component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
-</component>
-<component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
-</component>
-<component name="sensorchannelsreference" long-name="Sensor Channels Reference">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
-</component>
-<component name="ssyreference" long-name="SSY Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
-</component>
-<component name="tiltcompensationstub" long-name="Tilt Compensation Stub">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
-</component>
-<component name="tvoutbehaviour" long-name="TV Out Behaviour">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
-</component>
-<component name="wiredbearerreference" long-name="Wired Bearer Reference" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
-</component>
-</collection>
-<collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-<component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" plugin="Y">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-</component>
-</collection>
-<collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-<component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/browserui/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
-<collection name="browserui_info" long-name="Browser UI Info" level="ui">
-<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="/sf/app/browserui" proFile="browserui.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/camera/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="camera" level="apps" long-name="Camera Apps">
-<collection name="camerauis" long-name="Camera UIs">
-<component name="cameraxui" filter="s60" long-name="CameraX UIs">
-<unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/commonemail/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
-<!-- need to resolve the qt parts into proper components, then uncomment the units -->
-<collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
-<component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
-<!--<unit bldFile="email_plat" qt:proFile="email_plat.pro"/> -->
-</component>
-</collection>
-<collection name="emailservices" long-name="Email Services" level="service">
-<component name="nmailbase" filter="s60" long-name="NMail Base" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
-</component>
-<component name="emailcommon" filter="s60" long-name="Email Common" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
-</component>
-<component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
-</component>
-<component name="emailstore" filter="s60" long-name="Email Store" introduced="^2" class="placeholder">
-<!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
-</component>
-<component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
-</component>
-<component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
-</component>
-</collection>
-<collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
-<component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
-<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
-<!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
-</component>
-<component name="nmimapclientplugin" filter="s60" long-name="NM IMAP Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
-</component>
-<component name="nmipsmtms" filter="s60" long-name="NM IPS Client Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
-</component>
-<component name="nmipssettings" filter="s60" long-name="NM IPS Settings" introduced="^4" class="placeholder">
-<!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
-</component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2" class="placeholder">
-<!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
-<!-- can the exports be broken up into the other components or made a config component?-->
-</component>
-</collection>
-<collection name="emailuis" long-name="Email UIs" level="app">
-<component name="nmailuiengine" filter="s60" long-name="Nmail UI Engine" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
-</component>
-<component name="nmailuiwidgets" filter="s60" long-name="Nmail UI Widgets" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
-</component>
-<component name="nmailuiwidgetsplugin" filter="s60" long-name="Nmail UI Widgets Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
-</component>
-<component name="nmsettingui" filter="s60" long-name="Nmail Setting UI" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
-</component>
-<component name="nmailcpplugin" filter="s60" long-name="Nmail CP Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
-</component>
-<component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
-<!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
-</component>
-<component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
-</component>
-<component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
-<!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
-</component>
-</collection>
-<collection name="commonemail_info" long-name="Email Apps Info" level="app">
-<component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
-<!-- split into actual components -->
-<unit bldFile="/sf/app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/conntools/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
-<collection name="nettools" long-name="Net Tools" level="app">
-<component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
-<unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
-</component>
-</collection>
-<collection name="emulatorlan" long-name="Emulator LAN" level="config">
-<!-- component is actually a colleciton, should be moved down a directory -->
-<component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
-<unit bldFile="/sf/app/conntools/emulatorlan/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/contacts/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<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" long-name="Contacts Apps" levels="engine support services 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" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
-</component>
-<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" filter="s60" long-name="Phonebook Application" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/phonebookapp" qt:proFile="phonebookapp.pro"/> -->
-</component>
-<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" 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="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="/sf/app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<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="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-<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="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="/sf/app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="/sf/app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
-</component>
-<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="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="/sf/app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
-</component>
-<component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<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" purpose="optional">
-<unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/contentcontrol/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
-<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
-<component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
-<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
-</component>
-<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
-<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-</component>
-</collection>
-<collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-<component name="secon" filter="s60" long-name="Service Controllers">
-<unit bldFile="/sf/app/contentcontrol/connectivitymodules/secon/group"/>
-</component>
-</collection>
-<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
-<!-- Component at wrong rank, should move down a directory -->
-<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
-<unit bldFile="/sf/app/contentcontrol/dsdcmoadapter/group"/>
-</component>
-</collection>
-<collection name="omads" long-name="OMA Data Sync" level="app">
-<component name="omads_build" filter="s60" long-name="OMA DS Build">
-<unit bldFile="/sf/app/contentcontrol/omads/group"/>
-<!-- need to remove #include and rename and OMA DS ROM -->
-</component>
-<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
-<unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-<component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-<unit bldFile="/sf/app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/devicecontrol/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
-<collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
-<component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
-</component>
-<component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
-</component>
-<component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
-</component>
-<component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/files/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
-<collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
-<unit bldFile="/sf/app/files/filemanager/src/fmbkupengine/group"/>
-</component>
-<component name="filemanager_build" filter="s60" long-name="File Manager Build">
-<!-- break this up into components or move down a directory -->
-<unit bldFile="/sf/app/files/filemanager" proFile="filemanager.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/firsttimeuse/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
-<!-- these empty collections are really components. Move down a directory and supply units -->
-<collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
-<collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
-<collection name="wizardproviders" long-name="Wizard Providers" level="support"/>
-<collection name="stateproviders" long-name="State Providers" level="support"/>
-<collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
-<collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
-<component name="firsttimeuse_build" long-name="First Time Use Build">
-<unit bldFile="/sf/app/firsttimeuse" proFile="ftu.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/helps/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
-<collection name="userguide" long-name="User Guide" level="if">
-<!-- collection is really a component. Move down a directory -->
-<component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/helps/userguide" proFile="Userguide.pro"/>
-</component>
-</collection>
-<collection name="symhelp" long-name="Symbian Help" level="eng">
-<component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/app/helps/symhelp/helpmodel/group" mrp="/sf/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-</component>
-</collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/homescreen/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="/sf/app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
-<collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
-</collection>
-<collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/imgeditor/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
-<collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="sf_build" class="api">
-<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="sf_build" class="api">
-<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="sf_build" class="api">
-<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="sf_build" class="api">
-<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="sf_build" class="api">
-<unit bldFile="/sf/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="sf_build" long-name="Plugin Base">
-<unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="sf_build" long-name="Image Editor Plugin Base">
-<unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="sf_build" long-name="Image Editor UI">
-<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="sf_build" long-name="Image Editor Manager">
-<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="sf_build" long-name="Image Editor Application">
-<unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="sf_build" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-         -->
-</component>
-<component name="editorprovider" filter="sf_build" long-name="Image Editor Provider">
-<unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="sf_build" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="sf_build" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-         -->
-</component>
-<component name="imageeditorutils" filter="sf_build" long-name="Image Editor Utilities">
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="sf_build" long-name="System Parameters">
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="sf_build" long-name="Image Editor Engine Wrapper">
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="sf_build" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/internetradio/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-<collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-<!-- collection is really a component. Move down a dir -->
-<component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-<unit bldFile="/sf/app/internetradio/internetradio2.0/group"/>
-</component>
-</collection>
-<collection name="presetserver" long-name="Preset Server" level="server">
-<!-- collection is really a component. Move down a dir -->
-<component name="presetserver_build" long-name="Preset Server Build">
-<unit bldFile="/sf/app/internetradio/presetserver/group"/>
-</component>
-</collection>
-<collection name="qtinternetradio" long-name="Qt Internet Radio">
-<component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-<!--  Move down a dir or break into components-->
-<unit bldFile="/sf/app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/jrt/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
-<collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
-<component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
-<unit bldFile="/sf/app/jrt/jrt_plat/java_registry_api/build"/>
-</component>
-<component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
-<unit bldFile="/sf/app/jrt/jrt_plat/java_env_info_api/build"/>
-</component>
-<component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
-<unit bldFile="/sf/app/jrt/jrt_plat/java_debug_api/build"/>
-</component>
-</collection>
-<collection name="build_nativejava" long-name="Build Native Java">
-<component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javacommons" long-name="Java Commons" level="generic">
-<component name="javacommons_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javaruntimes" long-name="Java Runtimes" level="rt">
-<component name="javaruntimes_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javauis" long-name="Java UIs" level="ui">
-<component name="javauis_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javamanager" level="generic">
-<component name="javamanager_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javatools" long-name="Java Tools" level="util">
-<component name="javatools_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-<collection name="javaextensions" long-name="Java Extensions" level="generic">
-<component name="javaextensions_build" filter="s60" long-name="JRT Build">
-<unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
-<unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/location/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-<collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
-<component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-<unit bldFile="/sf/app/location/location_plat" proFile="location_plat.pro"/>
-</component>
-</collection>
-<collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-<unit bldFile="/sf/app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-</component>
-</collection>
-<collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
-<!--collection is really a component. Should move down a directory -->
-<component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
-<unit bldFile="/sf/app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/messaging/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
-<collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
-<component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
-<component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
-<component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api"/>
-<component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api"/>
-<component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api"/>
-<component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api"/>
-<component name="conversation_services_client_api" long-name="Conversation Services Client API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_plugin_api" long-name="Conversation Services Plugin API" filter="s60" introduced="^4" class="api"/>
-<component name="conversation_services_utilities_api" long-name="Conversation Services Utilities API" filter="s60" introduced="^4" class="api"/>
-<component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
-<component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<unit bldFile="/sf/app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
-<component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
-<component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
-<component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<unit bldFile="/sf/app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
-<component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-</component>
-</collection>
-<collection name="messagingappbase" long-name="Messaging App Base" level="base">
-<component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
-<!-- break this up into the below components -->
-<unit bldFile="/sf/app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgmedia" filter="s60" long-name="Message Media"/>
-<component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
-<unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-</component>
-<component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/Group" mrp="/sf/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-</component>
-</collection>
-<collection name="mmsengine" long-name="MMS Engine" level="eng">
-<component name="mmsconninit" filter="s60" long-name="MMS Connection Initiator" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-</component>
-<component name="genutils" filter="s60" long-name="General Utils" class="placeholder">
-<!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-</component>
-<component name="mmsserversettings" filter="s60" long-name="MMS Server Settings" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-</component>
-<component name="mmsmessage" filter="s60" long-name="MMS Message" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-</component>
-<component name="mmshttptransport" filter="s60" long-name="MMS HTTP Transport" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-</component>
-<component name="mmscodec" filter="s60" long-name="MMS Codec" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-</component>
-<component name="mmsserver" filter="s60" long-name="MMS Server" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-</component>
-<component name="clientmtm" filter="s60" long-name="MMS Client MTM" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-</component>
-<component name="mmswatcher" filter="s60" long-name="MMS Watcher" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-</component>
-<component name="mmspushhandler" filter="s60" long-name="MMS Push Handler" plugin="Y" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-</component>
-<component name="applicationadapter" filter="s60" long-name="MMS Application Adapter" class="placeholder">
-<!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-</component>
-<component name="mmscodecclient" filter="s60" long-name="MMS Codec Client" class="placeholder">
-<!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-</component>
-<component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/app/messaging/mmsengine/mmssettings/group" mrp="/sf/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-</component>
-<component name="mmsconf" long-name="MMS Configuration" purpose="optional">
-<unit bldFile="/sf/app/messaging/mmsengine/mmsconf" mrp="/sf/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-</component>
-<component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="/sf/app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="messagingapp_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="/sf/app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
-</component>
-<component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-<unit bldFile="/sf/app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
-</component>
-<component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
-</component>
-<component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-<unit bldFile="/sf/app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="email" long-name="Email" level="plugin">
-<!-- use commonemail instead -->
-<component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-</component>
-<component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" deprecated="^3" plugin="Y">
-<unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-</component>
-</collection>
-<collection name="messaging_info" long-name="Messaging Apps Info" level="api">
-<component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/musicplayer/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
-<collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
-<component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component name="mpsettingsmanager" filter="s60" long-name="MP Settings Manager" introduced="^4" class="placeholder">
-<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="musicplayer_app " long-name="Music Player Application" level="app">
-<!-- collection is really a component, move down a directory -->
-<component name="musicplayer_app_build" filter="s60" long-name="Music Player Application Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
-<component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
-</component>
-<component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</component>
-</collection>
-<collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
-<component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
-</component>
-<component name="localaudio" filter="s60" long-name="Local Audio" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/localaudio/group"/>-->
-</component>
-<!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
-<component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
-</component>
-<component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
-</component>
-<component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-<component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should brak up into individual components  -->
-<unit bldFile="/sf/app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/organizer/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
-<collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
-<component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
-<!-- move into own .pro file -->
-<unit bldFile="/sf/app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
-</component>
-</collection>
-<collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
-<component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
-<unit bldFile="/sf/app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
-</component>
-<component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
-</component>
-<component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_exporter_api/group"/>-->
-</component>
-<component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_importer_api/group"/>-->
-</component>
-<component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api placeholder">
-<!--<unit bldFile="organizer_plat/calendar_launcher_api/group"/> -->
-</component>
-<component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
-<component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
-<component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
-</collection>
-<collection name="agendainterface" long-name="Agenda Interface" level="services">
-<!-- collection is really a component, should move down a directory -->
-<component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-<unit bldFile="/sf/app/organizer/agendainterface" proFile="agendainterface.pro"/>
-</component>
-</collection>
-<collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-<unit bldFile="/sf/app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
-</component>
-<component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-<unit bldFile="/sf/app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
-</component>
-<component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-<unit bldFile="/sf/app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
-</component>
-<component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
-</component>
-<component name="globaldata" filter="s60" long-name="Calendar Global Data">
-<unit bldFile="/sf/app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
-</component>
-<component name="settings" filter="s60" long-name="Calendar Settings">
-<unit bldFile="/sf/app/organizer/calendarui/settings" proFile="settings.pro"/>
-</component>
-<component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
-</component>
-<component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-<unit bldFile="/sf/app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
-</component>
-<component name="views" filter="s60" long-name="Calendar Views">
-<unit bldFile="/sf/app/organizer/calendarui/views" proFile="views.pro"/>
-</component>
-<component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-<unit bldFile="/sf/app/organizer/calendarui/controller" proFile="controller.pro"/>
-</component>
-<component name="calendarui_application" filter="s60" long-name="Calendar Application">
-<unit bldFile="/sf/app/organizer/calendarui/application" proFile="application.pro"/>
-</component>
-<component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
-</component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
-</component>
-</collection>
-<collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="/sf/app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
-<component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-<unit bldFile="/sf/app/organizer/notes" proFile="notes.pro"/>
-</component>
-</collection>
-<collection name="calendarengines" long-name="Calendar Engines" level="engine">
-<component name="versit2" filter="s60" long-name="Versit 2 iCal Parser" introduced="9.2">
-<unit bldFile="/sf/app/organizer/calendarengines/versit2/group"/>
-</component>
-<component name="agnversit2" filter="s60" long-name="Versit 2 Agenda Interface" introduced="9.2" plugin="Y">
-<unit bldFile="/sf/app/organizer/calendarengines/agnversit2/group"/>
-</component>
-<component name="caleninterimutils" filter="s60" long-name="Calendar Interim Utils" introduced="9.1">
-<unit bldFile="/sf/app/organizer/calendarengines/caleninterimutils/group"/>
-</component>
-<component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
-<unit bldFile="/sf/app/organizer/calendarengines/calenimp/group"/>
-</component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="/sf/app/organizer/calendarengines/caldav/group"/>
-</component>
-</collection>
-<collection name="clock" long-name="Clock" level="app">
-<!-- uncomment unit when block_build is split up-->
-<component name="clockengines" filter="s60" long-name="Clock Engines" class="placeholder">
-<!--<unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/> -->
-</component>
-<component name="clockmw" filter="s60" long-name="Clock Middleware" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
-</component>
-<component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
-<!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
-</component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
-<component name="clock_build" filter="s60" long-name="Clock Build">
-<!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="/sf/app/organizer/clock" proFile="clock.pro"/>
-</component>
-</collection>
-<collection name="pimappservices" long-name="PIM Application Services" level="services">
-<component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/app/organizer/pimappservices/calendar/group" mrp="/sf/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-</component>
-<component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/sf/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-</component>
-<component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc">
-<unit mrp="/sf/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-</component>
-</collection>
-<collection name="pimappsupport" long-name="PIM Application Support" level="support">
-<component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/app/organizer/pimappsupport/vcardandvcal/group" mrp="/sf/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-</component>
-<component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-<unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-</component>
-<component name="chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
-</component>
-</collection>
-<collection name="alarmui" long-name="Alarm UI" level="app">
-<!-- collection is really a component, should move down a directory -->
-<component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-<unit bldFile="/sf/app/organizer/alarmui" proFile="alarmui.pro"/>
-</component>
-</collection>
-<collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-<component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/phone/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
-<collection name="phoneapp" long-name="Phone Application" level="app">
-<component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
-</component>
-
-<component name="phoneringingtoneplayer" filter="s60" long-name="Phone Rining Tone Player">
-<unit bldFile="/sf/app/phone/phoneapp/phoneringingtoneplayer/group"/>
-</component>
-
-<component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
-<unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
-</component>
-<component name="phoneuistates" filter="s60" long-name="Phone UI States">
-<unit bldFile="/sf/app/phone/phoneapp/phoneuistates/group"/>
-</component>
-<component name="phoneuiutils" filter="s60" long-name="Phone UI Utils">
-<unit bldFile="/sf/app/phone/phoneapp/phoneuiutils/group"/>
-</component>
-<component name="silenceactionplugin" filter="s60" long-name="Silence Action Plugin" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneapp/silenceactionplugin/group"/>
-</component>
-<component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
-<unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-<unit bldFile="/sf/app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
-</component>
-<component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
-</component>
-<component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-<unit bldFile="/sf/app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
-</component>
-<component name="phoneui2" filter="s60" long-name="Phone UI">
-<unit bldFile="/sf/app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
-</component>
-</collection>
-<collection name="phoneengine" long-name="Phone Engine" level="engine">
-<component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-<unit bldFile="/sf/app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
-</component>
-<component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
-<unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
-</component>
-<component name="callhandling" filter="s60" long-name="Call Handling">
-<unit bldFile="/sf/app/phone/phoneengine/callhandling/group"/>
-</component>
-<component name="contacthandling2" filter="s60" long-name="Phone Contact Handling">
-<unit bldFile="/sf/app/phone/phoneengine/contacthandling2/group"/>
-</component>
-<component name="loghandling" filter="s60" long-name="Phone Log Handling">
-<unit bldFile="/sf/app/phone/phoneengine/loghandling/group"/>
-</component>
-<component name="engineinfo" filter="s60" long-name="Phone Engine Info">
-<unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
-</component>
-<component name="phonemodel" filter="s60" long-name="Phone Model">
-<unit bldFile="/sf/app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
-</component>
-<component name="servicehandling" filter="s60" long-name="Phone Service Handling">
-<unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
-</component>
-<component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-<unit bldFile="/sf/app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
-</component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
-</collection>
-<collection name="phoneuis" long-name="Phone UIs" level="ui">
-<component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-<unit bldFile="/sf/app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
-</component>
-<component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
-<unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-</collection>
-<collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-</component>
-<component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_comms_information_api/group"/>
-</component>
-<component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_information_api/group"/>
-</component>
-<component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_device_mode_api/group"/>
-</component>
-
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-
-<component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
-</component>
-<component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-</component>
-<component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-</component>
-<component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_logging_extension_api/group"/>
-</component>
-<component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_matching_extension_api/group"/>
-</component>
-<component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/phone_application_commands_api/group"/>
-</component>
-<component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-</component>
-<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/video_telephony_mediator_api/group"/>
-</component>
-<component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" introduced="^4" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/video_telephony_control_mediator_api/group"/>
-</component>
-</collection>
-<collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-<component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
-</component>
-<component name="phoneindicatorplugin" filter="s60" long-name="Info Indicator Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/phoneindicatorplugin" proFile="phoneindicatorplugin.pro"/>
-</component>
-<component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
-</component>
-<component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
-</component>
-</collection>
-<collection name="phonesettings" long-name="Phone Settings" level="plugin">
-<component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/photos/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="photos" level="apps" long-name="Photos" levels="util support ui app">
-<collection name="photos_group" long-name="Photos Group" level="support">
-<component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="group" qt:proFile="group.pro"/> -->
-</component>
-</collection>
-<collection name="photos_loggers" long-name="Photos Loggers" level="util">
-<component name="photos_loggerqt" filter="s60" long-name="Photos Logger Qt" introduced="^4" class="placeholder">
-<!--<unit bldFile="loggers/loggerqt" qt:proFile="loggerqt.pro"/> -->
-</component>
-</collection>
-<collection name="photos_commonutilities" long-name="Photos Common Utilities" level="util">
-<component name="photos_externalutility" filter="s60" long-name="Photos External Utility" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/externalutility" qt:proFile="externalutility.pro"/> -->
-</component>
-<component name="imagedecoderwrapper" filter="s60" long-name="Image Decoder Wrapper" introduced="^4" class="placeholder">
-<!--<unit bldFile="commonutilities/imagedecoderwrapper" qt:proFile="imagedecoderwrapper.pro"/> -->
-</component>
-</collection>
-<collection name="photos_ui" long-name="Photos UI" level="ui">
-<component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
-</component>
-<component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
-</component>
-<component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
-</component>
-<component name="photos_viewmanagement" filter="s60" long-name="Photos View Management" introduced="^4" class="placeholder">
-<!--<unit bldFile="ui/viewmanagement" qt:proFile="viewmanagement.pro"/> -->
-</component>
-</collection>
-<collection name="photos_main" long-name="Photos Main" level="support">
-<component name="photos_main_build" filter="s60" long-name="Photos Main Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="main" qt:proFile="main.pro"/> -->
-</component>
-</collection>
-<collection name="imageviewerapp" long-name="Image Viewer App" level="support">
-<component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
-<!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
-</component>
-</collection>
-<collection name="photos_info" long-name="Photos Info" level="support">
-<component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
-<!--  split this up into the above components  -->
-<unit bldFile="/sf/app/photos" proFile="photos.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/podcatcher/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
-<collection name="podcatcher_info" long-name="Podcatcher" level="app">
-<component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
-<!-- has exports from top level bld.inf -->
-<unit bldFile="/sf/app/podcatcher/group"/>
-</component>
-<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
-<unit bldFile="/sf/app/podcatcher/application/group"/>
-</component>
-<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
-<unit bldFile="/sf/app/podcatcher/engine/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/printing/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="printing" level="services" long-name="Printing"/>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/radio/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
-<collection name="radioengine" long-name="Radio Engine" level="engine">
-<component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
-<unit bldFile="/sf/app/radio/radioengine/utils/group"/>
-</component>
-<component name="radioenginesettings" filter="s60" long-name="Radio Engine Settings" introduced="^4">
-<unit bldFile="/sf/app/radio/radioengine/settings/group"/>
-</component>
-<component name="radioengine_engine" filter="s60" long-name="Radio Engine" introduced="^4">
-<unit bldFile="/sf/app/radio/radioengine/engine/group"/>
-</component>
-</collection>
-<collection name="radioapp" long-name="Radio App" level="ui">
-<component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="/sf/app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
-</component>
-<component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-<unit bldFile="/sf/app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
-</component>
-<component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-<unit bldFile="/sf/app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
-</component>
-<component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-<unit bldFile="/sf/app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
-</component>
-<component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-<unit bldFile="/sf/app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
-</component>
-<component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
-<unit bldFile="/sf/app/radio/rom"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/recents/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
-<collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
-<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
-<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
-<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
-</collection>
-<collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="/sf/app/recents/logsui" proFile="logsui.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/rndtools/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
-<collection name="creator" long-name="Creator" level="support">
-<!-- collection is really a component. Should move down a directory -->
-<component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/creator/group"/>
-</component>
-</collection>
-<collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="/sf/app/rndtools/filebrowser/group"/>
-</component>
-</collection>
-<collection name="launcher" long-name="Launcher" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/launcher/group"/>
-</component>
-</collection>
-<collection name="loadgen" long-name="Load Generator" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/loadgen/group"/>
-</component>
-</collection>
-<collection name="perfmon" long-name="Performance Monitor" level="test">
-<!-- collection is really a component. Should move down a directory -->
-<component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/perfmon" proFile="perfmon.pro"/>
-</component>
-</collection>
-<collection name="screengrabber" long-name="Screen Grabber" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/screengrabber" proFile="screengrabber.pro"/>
-</component>
-</collection>
-<collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="/sf/app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="/sf/app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="/sf/app/rndtools/stifui/group"/>
-</component>
-</collection>
-<collection name="memspyui" long-name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="/sf/app/rndtools/memspyui/group"/>
-</component>
-</collection>
-<collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="/sf/app/rndtools/htiui/htiadmin/group"/>
-</component>
-<component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="/sf/app/rndtools/htiui/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/search/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
-<collection name="search_info" long-name="Search Info">
-<component name="search_build" long-name="Search Build" introduced="^4">
-<unit bldFile="/sf/app/search/group"/>
-</component>
-</collection>
-<collection name="searchui" long-name="Search UI">
-<component name="searchui_build" long-name="Search UI Build" introduced="^4">
-<unit bldFile="/sf/app/search/searchui" proFile="searchui.pro"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/settingsuis/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
-<collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
-<component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-<unit bldFile="/sf/app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-<collection name="controlpanelui" long-name="Control Panel UI" level="ui">
-<!-- collection is really a component, move down a dir -->
-<component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-<unit bldFile="/sf/app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/techview/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="/sf/app/techview/buildverification/smoketest/Group" mrp="/sf/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</collection>
-<collection name="techviewplat" long-name="Techview Platform" level="services"/>
-<collection name="techviewui" long-name="Techview UI" level="ui"/>
-<collection name="tv_controlpanel" long-name="Control Panel" level="ui"/>
-<collection name="pimapps" long-name="PIM Apps" level="apps3"/>
-<collection name="securityapps" long-name="Security Apps" level="apps3"/>
-<collection name="utilityapps" long-name="Utility Apps" level="apps2"/>
-<collection name="installationapps" long-name="Installation Apps" level="apps2"/>
-<collection name="messagingapps" long-name="Messaging Apps" level="apps2"/>
-<collection name="telephonyapps" long-name="Telephony Apps" level="apps1"/>
-<collection name="networkingapps" long-name="Networking Apps" level="apps1"/>
-<collection name="networkingutils" long-name="Networking Utils" level="utils"/>
-<collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1"/>
-<collection name="testapps" long-name="Test Apps" level="utils"/>
-<collection name="avapps" long-name="A/V Apps" level="apps3"/>
-<collection name="toolkit" long-name="Toolkit" level="utils"/>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="/sf/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/videoeditor/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" filter="sf_build" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="sf_build" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="sf_build" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="sf_build" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="sf_build" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="sf_build" long-name="Video Provider" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="sf_build" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="sf_build" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="sf_build" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="sf_build" long-name="AVC Editing" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="sf_build" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="sf_build" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="sf_build" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="sf_build" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="sf_build" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/videoplayer/package_definition.xml	Fri Jun 11 15:39:07 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services 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" 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" 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" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
-</component>
-<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" 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" 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">
-<!--  this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="/sf/app/videoplayer/mediasettings/group"/>
-</component>
-</collection>
-<collection name="videoplayerapp" long-name="Video Player App" level="apps">
-<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" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="/sf/app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
-<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" 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" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group"/>
-</component>
-</collection>
-</block>
-  </layer>
- </systemModel>
-</SystemDefinition>
\ No newline at end of file