--- a/symbian4/mw/phonesrv/package_definition_3.0.xml	Fri Apr 23 16:10:50 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition_3.0.xml	Tue Apr 27 14:22:10 2010 +0100
@@ -2,29 +2,164 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
   <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+   <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/string_parser_api/group"/>
+   </component>
+   <component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_mcn_client_api/cbs_mcn_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_mcn_client_api/group"/>
+   </component>
+   <component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_engine_api/converged_call_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_engine_api/group"/>
+   </component>
+   <component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/aiw_dial_data_consumer_api/aiw_dial_data_consumer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+   </component>
+   <component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_api/phone_client_ussd_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_api/group"/>
+   </component>
    <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
-    <unit unitID="tedo.sat_refresh_api.test" bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/network_handling_engine_api/group"/>
+   </component>
+   <component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_emergency_call_api/phone_client_emergency_call_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_emergency_call_api/group"/>
+   </component>
+   <component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
+   </component>
+   <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/dial_utils_api/group"/>
+   </component>
+   <component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_image_handler_api/group"/>
+   </component>
+   <component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_messenger_api/phone_client_messenger_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_messenger_api/group"/>
    </component>
    <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
-    <unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_api/group"/>
    </component>
    <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
-    <unit unitID="tedo.sat_service_api.test" bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cbs_message_api/group"/>
+   </component>
+   <component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_server_information_api/phone_client_server_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_server_information_api/group"/>
+   </component>
+   <component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_ussd_internal_api/phone_client_ussd_internal_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_internal_api/group"/>
+   </component>
+   <component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_command_handler_api/phone_client_command_handler_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_command_handler_api/group"/>
+   </component>
+   <component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_notify_api/phone_client_notify_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_notify_api/group"/>
+   </component>
+   <component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_client_utility_api/phone_client_utility_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_utility_api/group"/>
+   </component>
+   <component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/telephony_network_information_api/telephony_network_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_network_information_api/group"/>
+   </component>
+   <component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/secondary_display_sat_api/group"/>
+   </component>
+   <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/callui_reconnect_query_api/group"/>
+   </component>
+   <component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/service_provider_settings_api/group"/>
+   </component>
+   <component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/converged_call_provider_api/converged_call_provider_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/converged_call_provider_api/group"/>
+   </component>
+   <component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/incoming_call_monitor_api/incoming_call_monitor_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/incoming_call_monitor_api/group"/>
+   </component>
+   <component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/default_emergency_numbers_api/group"/>
+   </component>
+   <component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/cenrep_database_api/cenrep_database_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cenrep_database_api/group"/>
+   </component>
+   <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/ss_settings_api/ss_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/ss_settings_api/group"/>
+   </component>
+   <component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_observer_api/group"/>
+   </component>
+   <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_notes_ui_api/group"/>
+   </component>
+   <component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_settings_api/group"/>
+   </component>
+   <component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+    <unit bldFile="phonesrv_plat/voice_mailbox_number_api/group"/>
+   </component>
+   <component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/voice_mailbox_settings_api/voice_mailbox_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/voice_mailbox_settings_api/group"/>
    </component>
    <component id="call_information_api" name="Call Information API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
-    <unit unitID="tedo.call_information_api.test" bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
-    <unit unitID="tedo.call_remote_party_information_api.test" bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+    <unit bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
     <unit bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
    </component>
+   <component id="dialpad_api" name="Dialpad API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="phonesrv_plat/dialpad_api/group"/>
+   </component>
   </collection>
   <collection id="cellular" name="Cellular" level="server">
    <component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">