--- a/symbian3/app/location/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/app/location/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -2,10 +2,6 @@
<SystemDefinition schema="3.0.0">
<package id="location" name="Location Apps" levels="ui events loc apps">
<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
- <component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
- <meta rel="Api" href="loc_plat/location_centre_api/location_centre_api.metaxml"/>
- <unit bldFile="loc_plat/location_centre_api/group"/>
- </component>
</collection>
<collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
<component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
@@ -99,23 +95,5 @@
<unit bldFile="mapnavproviderrefapp/group"/>
</component>
</collection>
- <collection id="locationcentre" name="Location Centre" level="loc">
- <component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
- <unit bldFile="locationcentre/lcutils/group"/>
- </component>
- <component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
- <unit bldFile="locationcentre/lcservice/group"/>
- </component>
- <component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
- <unit bldFile="locationcentre/lcserver/group"/>
- </component>
- <component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
- <unit bldFile="locationcentre/lcapp/group"/>
- </component>
- <component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
- <!-- consider distributing this into the other components or collapsing into a single component -->
- <unit bldFile="locationcentre/group"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian3/app/rndtools/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/app/rndtools/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -67,9 +67,6 @@
</component>
</collection>
<collection id="htiui" name="Harmonized Test Interface UI" level="generic">
- <component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
- <unit bldFile="htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
- </component>
<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
<!-- can only have a single unit. Should #include from a common bld.inf file -->
<unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/app/utils/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/app/utils/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -8,9 +8,6 @@
<component id="calcsoft" filter="s60" name="Calculator Application">
<unit bldFile="extras/calcsoft/group"/>
</component>
- <component id="converter" filter="s60" name="Unit Converter">
- <unit bldFile="extras/converter/group"/>
- </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian3/mw/imsrv/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/mw/imsrv/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -102,7 +102,7 @@
<meta rel="Api" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
<unit bldFile="imsrv_plat/im_cache_server_api/group"/>
</component>
- <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+ <component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
<unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
</component>
</collection>
@@ -125,9 +125,6 @@
<component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
<unit bldFile="imservices/xmppsettingsfetcher/group"/>
</component>
- <component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
- <unit bldFile="imservices/ossprotocoladaptation/group"/>
- </component>
<component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
<unit bldFile="imservices/instantmessagingcache/group"/>
</component>
--- a/symbian3/os/cellularsrv/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/os/cellularsrv/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -77,7 +77,7 @@
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
<unit bldFile="telephonyserverplugins/multimodetsy/group" mrp="telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
- <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+ <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin" filter="test">
<unit bldFile="telephonyserverplugins/simtsy/group" mrp="telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
</component>
<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -177,7 +177,7 @@
<package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition.xml"/>
<package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition.xml"/>
<package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition.xml"/>
- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/>
+ <!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
</layer>
<layer id="app" name="Applications" levels="services apps">
<package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition.xml"/>
@@ -200,7 +200,7 @@
<package id="dictionary" level="services" tech-domain="pr" href="../../../../app/dictionary/package_definition.xml"/>
<package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition.xml"/>
<package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/>
- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/>
+ <!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
<package id="videoplayer" level="apps" tech-domain="ma" href="../../../../app/videoplayer/package_definition.xml"/>
<package id="photos" level="apps" tech-domain="ma" href="../../../../app/photos/package_definition.xml"/>
<package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition.xml"/>
--- a/symbian3/os/imagingext/package_definition.xml Thu May 27 16:53:39 2010 +0100
+++ b/symbian3/os/imagingext/package_definition.xml Tue Jun 01 11:42:12 2010 +0100
@@ -34,6 +34,10 @@
<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>
+ <component id="ecam_use_case_hint_custom_api" name="ECam Use Case Hint Custom API" class="api" filter="s60">
+ <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
+ <unit bldFile="imagingext_plat/ecam_use_case_hint_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">