--- a/symbian3/os/imagingext/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
-      <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
-        <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
-      </component>
-      <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
-      	<!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-        <unit bldFile="imageadaptationextensions/group"/>
-      </component>
-    </collection>
-    <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
-      <component id="exiflib" filter="s60" name="Exif Library">
-        <unit bldFile="imagingmodules/exiflib/group"/>
-      </component>
-      <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
-        <unit bldFile="imagingmodules/jp2kcodec/group"/>
-      </component>
-    </collection>
-    <collection id="imagingext_info" name="Imaging Extensions Info" level="app-if">
-      <component id="imagingext_plat" filter="s60" name="Imaging Extensions Platform Interfaces" class="api">
-        <unit bldFile="imagingext_plat/group"/>
-      </component>
-      <component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
-        <unit bldFile="imagingext_pub/group"/>
-      </component>
-      <component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
-        <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
-      </component>
-      <component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Public API Tests" purpose="development">
-        <unit bldFile="imagingext_pub/exif_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
+   <component id="exif_api" name="Exif API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
+    <unit bldFile="imagingext_pub/exif_api/group" filter="!test"/>
+    <unit bldFile="imagingext_pub/exif_api/tsrc/group"  filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+   <component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/jpeg2000_icl_plugin_api/jpeg2000_icl_plugin_api.metaxml"/>
+    <unit bldFile="imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+   </component>
+   <component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/extended_icl_jpeg_api/extended_icl_jpeg_api.metaxml"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/h324_annex_k_custom_api/h324_annex_k_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/h324_annex_k_custom_api/group"/>
+   </component>
+   <component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_orientation_custom_api/ecam_orientation_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_orientation_custom_api/group"/>
+   </component>
+   <component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_ui_orientation_override_custom_api/ecam_ui_orientation_override_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+   </component>
+   <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
+   </component>
+  </collection>
+  <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+   <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+    <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
+   </component>
+   <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+    <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+    <unit bldFile="imageadaptationextensions/group"/>
+   </component>
+  </collection>
+  <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+   <component id="exiflib" filter="s60" name="Exif Library">
+    <unit bldFile="imagingmodules/exiflib/group"/>
+   </component>
+   <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+    <unit bldFile="imagingmodules/jp2kcodec/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>