--- a/symbian3/mw/metadatasrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
-    <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
-      <component id="mediafetch" filter="s60" name="Media Fetch">
-        <unit bldFile="mediamanagementutilities/mediafetch/group"/>
-      </component>
-    </collection>
-    <collection id="metadatasrv_info" name="Legacy Metadata Services Info" level="specific">
-      <component id="metadatasrv_plat" filter="s60" name="Legacy Metadata Services Platform Interfaces" class="api">
-        <unit bldFile="metadatasrv_plat/group"/>
-      </component>
-      <component id="metadatasrv_pub" filter="s60" name="Legacy Metadata Services Public Interfaces" class="api">
-        <unit bldFile="metadatasrv_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+  <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+   <component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
+    <meta rel="config">
+     <not-defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>
+   </component>
+   <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+    <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
+    <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
+   </component>
+  </collection>
+  <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+   <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+    <meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
+    <unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
+   </component>
+   <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
+    <meta rel="config">
+     <not-defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+   </component>
+   <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
+    <meta rel="config">
+     <not-defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>
+   </component>
+  </collection>
+  <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+   <component id="mediafetch" filter="s60" name="Media Fetch">
+    <unit bldFile="mediamanagementutilities/mediafetch/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>