--- a/symbian3/os/boardsupport/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/os/boardsupport/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,98 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!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 >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!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^3" schema="2.0.1">
-  <systemModel>
-    <layer name="os" long-name="OS" levels="hw services">
-      <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
-        <collection name="emulator" long-name="Emulator" level="bsp">
-          <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
-            <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-          </component>
-        </collection>
-        <collection name="haitest" long-name="HAI Test Suites" level="test">
-          <component name="bspsvs" long-name="BSP Verification Suite" introduced="^2" purpose="development">
-            <unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-          </component>
-        </collection>
-        <collection name="boardsupport_info" long-name="Board Support Info" level="config">
-          <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="^2" purpose="development" class="config PC">
-            <unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="boardsupport" name="Board Support" levels="bsp test 2 3 config">
+    <collection id="emulator" name="Emulator" level="bsp">
+      <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+        <unit bldFile="emulator/emulatorbsp" mrp="emulator/emulatorbsp/base_wins.mrp"/>
+      </component>
+    </collection>
+    <collection id="haitest" name="HAI Test Suites" level="test">
+      <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+        <unit mrp="haitest/bspsvs/group/bspsvs.mrp"/>
+      </component>
+    </collection>
+    <collection id="boardsupport_info" name="Board Support Info" level="config">
+      <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>