diff -r 453dfc402455 -r 0aa8cc770c8a package_definition.xml
--- a/package_definition.xml	Thu Aug 19 10:44:03 2010 +0300
+++ b/package_definition.xml	Tue Aug 31 16:03:15 2010 +0300
@@ -1,56 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
-    <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
-      <component id="secon" filter="s60" name="Service Controllers">
-        <unit bldFile="connectivitymodules/secon/group"/>
-      </component>
-    </collection>
-    <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
-      <component id="remoteconn_plat" filter="s60" name="Remote Connectivity Platform Interfaces" class="api">
-        <unit bldFile="remoteconn_plat/group"/>
-      </component>
-      <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="mtptransports" name="MTP Transports" level="plugin">
-      <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-      </component>
-      <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-      </component>
-      <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-      </component>
-    </collection>
-    <collection id="mtpfws" name="MTP Frameworks" level="framework">
-      <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
-        <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
-      </component>
-      
-    </collection>
-    <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
-      <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-      </component>
-    </collection>
-    <collection id="backupandrestore" name="Backup and Restore" level="specific">
-      <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
-        <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-      </component>
-     <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
-        <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-      </component>
-    </collection>
-    <collection id="obex" name="OBEX" level="generic">
-      <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
-        <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
-      </component>
-      <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
-        <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
+  <collection id="remoteconn_plat" name="Remote Connectivity Platform Interfaces" level="specific">
+   <component id="dialup_connection_status_api" name="Dialup Connection Status API" class="api" filter="s60">
+    <meta rel="Api" href="remoteconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>
+    <unit bldFile="remoteconn_plat/dialup_connection_status_api/group"/>
+   </component>
+   <component id="dun_secondary_display_notification_api" name="Dialup Secondary Display Notification API" class="api" filter="s60">
+    <meta rel="Api" href="remoteconn_plat/dun_secondary_display_notification_api/dun_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="remoteconn_plat/dun_secondary_display_notification_api/group"/>
+   </component>
+   <component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+    <!-- Missing? <meta rel="Api" href="remoteconn_plat/generic_hid_api/generic_hid_api.metaxml"/> -->
+    <unit bldFile="remoteconn_plat/generic_hid_api/group"/>
+   </component>
+   <component id="locod_bearer_plugin_api" name="Local Connectivity Daemon Bearer Plugin API" class="api" filter="s60">
+    <!-- Missing? <meta rel="Api" href="remoteconn_plat/locod_bearer_plugin_api/locod_bearer_plugin_api.metaxml"/> -->
+    <unit bldFile="remoteconn_plat/locod_bearer_plugin_api/group"/>
+   </component>
+   <component id="locod_service_plugin_api" name="Local Connectivity Daemon Service Plugin API" class="api" filter="s60">
+    <!-- Missing? <meta rel="Api" href="remoteconn_plat/locod_service_plugin_api/locod_service_plugin_api.metaxml"/> -->
+    <unit bldFile="remoteconn_plat/locod_service_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+   <component id="locod" name="Local Connectivity Daemon" introduced="^4" purpose="optional" filter="s60">
+         <unit bldFile="localconnectivityservice/locod/group"/>
+   </component>
+   <component id="dun" name="Dial-Up Networking" introduced="^4" purpose="optional" filter="s60">
+         <unit bldFile="localconnectivityservice/dun/group"/>
+   </component>
+   <component id="generichid" name="Generic Human-Interface Device" introduced="^4" purpose="optional" filter="s60">
+         <unit bldFile="localconnectivityservice/generichid/group"/>
+   </component>
+   <component id="headset" name="Headset" introduced="^4" purpose="optional" filter="s60">
+         <unit bldFile="localconnectivityservice/headset/group"/>
+   </component>
+  </collection>
+  <collection id="mtptransports" name="MTP Transports" level="plugin">
+   <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+   </component>
+   <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+   </component>
+   <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+    <meta rel="config">
+     <defined condition="FF_MTP_CONTROLLER"/>
+    </meta>
+    <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtpfws" name="MTP Frameworks" level="framework">
+   <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+    <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
+   </component>
+   <component id="devdpextn" name="MTP Device Provider Extension" introduced="^4" purpose="optional">
+ 	  <!-- can't have a component inside another component. Need to move to mtpfws/devdpextn/group -->
+	 <unit bldFile="mtpfws/mtpfw/dataproviders/devdp/devdpextn/group"/>
+   </component>
+  </collection>
+  <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+   <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+   </component>
+   <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+   </component>
+   <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" introduced="^3" purpose="optional" class="plugin" filter="gt">
+    <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+   </component>
+   <component id="pictbridgeengine" name="MTP PictBridge Engine" introduced="^4" purpose="optional" filter="s60">
+ 	  <!-- can't have a component inside another component. Need to move to mtpdataproviders/pictbridgeengine/group -->
+     <unit bldFile="mtpdataproviders/mtppictbridgedp/pictbridgeengine/group"/>
+   </component>
+   <component id="mtpplaybackcontroldp" name="MTP Playback Control Data Provider" introduced="^4" filter="s60" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpplaybackcontroldp/group" mrp="mtpdataproviders/mtpplaybackcontroldp/group/mtp_playbackcontroldp.mrp"/>
+   </component>
+  </collection>
+  <collection id="backupandrestore" name="Backup and Restore" level="specific">
+   <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+    <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+   </component>
+   <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+    <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+   </component>
+  </collection>
+  <collection id="obex" name="OBEX" level="generic">
+   <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+    <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
+   </component>
+   <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+    <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>