--- a/symbian3/app/homescreen/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,53 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!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>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreen" long-name="Home Screen Apps" tech_domain="ui" level="apps" levels="fw apps">
-    <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
-     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-     </component>
-     <component name="exths" long-name="ExtHS" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/exths/group"/>
-     </component>
-     <component name="activeidle3" long-name="Active Idle 3" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/group"/>
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
-     </component>
-     <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/group"/>
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
-     </component>
-    </collection>
-    <collection name="menufw" long-name="Menu Framework" level="fw">
-     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/hierarchynavigator/group"/>
-     </component>
-     <component name="menufwui" long-name="Menu Framework UI" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/menufwui/group"/>
-     </component>
-     <component name="menusuites" long-name="Menu Suites" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/menusuites/group"/>
-     </component>
-     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/group"/>
-     </component>
-    </collection>
-    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/group"/>
-     </component>
-     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/homescreen/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/homescreen_plat/group"/>
-     </component>
-    </collection>
-   </block>
+<block name="homescreen" level="apps" long-name="Home Screen Apps"/>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file