diff -r 259a8b0dc6aa -r d8ac09bd7e84 RCL_3/mw/mmuifw/package_definition.xml
--- a/RCL_3/mw/mmuifw/package_definition.xml	Wed Nov 10 14:38:07 2010 +0000
+++ b/RCL_3/mw/mmuifw/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
@@ -55,112 +55,111 @@
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
 <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
-<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
+<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
 </component>
-<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" class="api">
+<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
 </component>
-<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" class="api">
+<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
 </component>
-<component name="osn_container_api" long-name="OSN Container API" filter="s60" class="api">
+<component name="osn_container_api" long-name="OSN Container API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
 </component>
-<component name="osn_global_api" long-name="OSN Global API" filter="s60" class="api">
+<component name="osn_global_api" long-name="OSN Global API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
 </component>
-<component name="osn_string_api" long-name="OSN String API" filter="s60" class="api">
+<component name="osn_string_api" long-name="OSN String API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
 </component>
-<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" class="api">
+<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
 </component>
-<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" class="api">
+<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
 </component>
-<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" class="api">
+<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
 </component>
-<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" class="api">
+<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
 </component>
-<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" class="api">
+<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
 </component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
+<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
 </component>
-<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" class="api">
+<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
 </component>
-<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" class="api">
+<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
 </component>
-<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" class="api">
+<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
 </component>
-<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" class="api">
+<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" deprecated="^3" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
 </component>
 </collection>
-<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build">
-<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
-<unit bldFile="/sf/mw/mmuifw/group"/>
+<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="util">
+<component name="mmuifw_rom" filter="s60" long-name="Multimedia UI Framework ROM" deprecated="^3">
+<unit bldFile="/sf/mw/mmuifw/rom/group"/>
 </component>
 </collection>
 <collection name="osncore" long-name="OS Neutral Library Core" level="util">
 <!-- collection is really a component. Move down a directory -->
-<component name="osncore_build" filter="s60" long-name="OSN Core Build">
+<component name="osncore_build" filter="s60" long-name="OSN Core Build" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/osncore/group"/>
 </component>
 </collection>
 <collection name="alfwidgetutils" long-name="Accelerated LAF Widget Utils" level="ui">
 <!-- collection is really a component. Move down a directory -->
-<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils">
+<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/alfwidgetutils/group"/>
 </component>
 </collection>
 <collection name="resourcepool" long-name="Resource Pool" level="util">
 <!-- collection is really a component. Move down a directory -->
-<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool">
+<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/resourcepool/group"/>
 </component>
 </collection>
 <collection name="widgetmodel" long-name="Widget Model" level="mdl">
 <!-- collection is really a component. Move down a directory -->
-<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build">
+<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/widgetmodel/group"/>
 </component>
 </collection>
 <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
 <!-- should spell out MUL in the collection name -->
-<component name="mullogging" filter="s60" long-name="MUL Logging">
+<component name="mullogging" filter="s60" long-name="MUL Logging" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/mullogging/group"/>
 </component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
+<component name="muldatamodel" filter="s60" long-name="MUL Data Model" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/muldatamodel/group"/>
 </component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
+<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/common/group"/>
 </component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
+<component name="gesturehelper" filter="s60" long-name="Gesture Helper" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/gesturehelper/group"/>
 </component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
+<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
 </component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
+<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
 </component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
+<component name="alfviewwidget" filter="s60" long-name="ALF View Widget" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfviewwidget/group"/>
 </component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
+<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
 </component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
+<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget" deprecated="^3">
 <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
 </component>
 </collection>