--- a/symbian3/app/graphicsuis/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/app/graphicsuis/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,99 +1,24 @@
 <?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="app" long-name="Applications" levels="services apps">
-      <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-        <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-          <component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
-            <unit bldFile="/sf/app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
-          </component>
-          <component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-          </component>
-          <component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
-            <unit bldFile="/sf/app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-          </component>
-        </collection>
-        <collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
-          <component name="svgtviewerplugin" filter="s60" long-name="SVG-T Viewer Plugin">
-            <unit bldFile="/sf/app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="graphicsuis" name="Graphics UIs" levels="util ui">
+  <collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
+   <component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
+    <meta rel="Api" href="graphicsuis_plat/svgt_viewer_ui_api/svgt_viewer_ui_api.metaxml"/>
+    <unit bldFile="graphicsuis_plat/svgt_viewer_ui_api/group"/>
+   </component>
+   <component id="svg_application_observer_utility_api" name="SVG Application Observer Utility API" class="api" filter="s60">
+    <meta rel="Api" href="graphicsuis_plat/svg_application_observer_utility_api/svg_application_observer_utility_api.metaxml"/>
+    <unit bldFile="graphicsuis_plat/svg_application_observer_utility_api/group"/>
+   </component>
+   <component id="svgt_file_view_details_dialog_api" name="SVG-T File View Details Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="graphicsuis_plat/svgt_file_view_details_dialog_api/svgt_file_view_details_dialog_api.metaxml"/>
+    <unit bldFile="graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
+   </component>
+  </collection>
+  <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
+   <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
+    <unit bldFile="svgtviewer/svgtviewerplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>