diff -r e9ebcfcb4702 -r 30e67220bf86 symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/app/camera/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,107 +1,31 @@
 <?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="camera" level="apps" long-name="Camera Apps">
-        <collection name="camera_plat" long-name="Camera Apps Platform Interfaces">
-          <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
-            <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
-          </component>
-          <component name="active_palette_2_api" long-name="Active Palette 2 API" filter="s60" class="api">
-            <unit bldFile="/sf/app/camera/camera_plat/active_palette_2_api/group"/>
-          </component>
-        </collection>
-        <collection name="camerauis" long-name="Camera UIs">
-          <component name="activepalette" filter="s60" long-name="Active Palette">
-            <unit bldFile="/sf/app/camera/camerauis/activepalette/group"/>
-          </component>
-          <component name="cameraapp" filter="s60" long-name="Camera Application">
-            <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
-            <unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group"/>
-          </component>
-        </collection>
-        <collection name="camera_info" long-name="Camera Apps Info">
-          <component name="camera_plat_test" filter="s60,test,api_test" long-name="Camera Apps Platform API Tests" purpose="development">
-            <!-- can only have one unit. #include from a single bld.inf? -->
-            <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/>
-            <unit bldFile="/sf/app/camera/camera_plat/active_palette_2_api/tsrc/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+ <package id="camera" name="Camera Apps">
+  <collection id="camera_plat" name="Camera Apps Platform Interfaces">
+   <component id="camcorder_ui_constants_api" name="Camcorder UI Constants API" class="api" filter="s60">
+    <meta rel="Api" href="camera_plat/camcorder_ui_constants_api/camcorder_ui_constants_api.metaxml"/>
+    <unit bldFile="camera_plat/camcorder_ui_constants_api/group"/>
+   </component>
+   <component id="active_palette_2_api" name="Active Palette 2 API" class="api" filter="s60">
+    <meta rel="Api" href="camera_plat/active_palette_2_api/active_palette_2_api.metaxml"/>
+    <unit bldFile="camera_plat/active_palette_2_api/group"/>
+   </component>
+  </collection>
+  <collection id="camerauis" name="Camera UIs">
+   <component id="activepalette" filter="s60" name="Active Palette">
+    <unit bldFile="camerauis/activepalette/group"/>
+   </component>
+   <component id="cameraapp" filter="s60" name="Camera Application">
+    <unit bldFile="camerauis/cameraapp/group"/>
+    <unit bldFile="camerauis/cameraapp/help/group"/>
+   </component>
+  </collection>
+  <collection id="camera_info" name="Camera Apps Info">
+   <component id="camera_plat_test" filter="s60,test,api_test" name="Camera Apps Platform API Tests" purpose="development">
+    <!-- can only have one unit. #include from a single bld.inf? -->
+    <unit bldFile="camera_plat/camcorder_ui_constants_api/tsrc/group"/>
+    <unit bldFile="camera_plat/active_palette_2_api/tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>