diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/classicui/package_definition_3.0.xml
--- a/symbian4/mw/classicui/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/classicui/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -215,10 +215,6 @@
     <unit bldFile="classicui_plat/extended_notes_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_animation_plugin_definitions_api" name="Screensaver Animation Plugin Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_animation_plugin_definitions_api/screensaver_animation_plugin_definitions_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-   </component>
    <component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/text_scroller_api/text_scroller_api.metaxml"/>
     <unit bldFile="classicui_plat/text_scroller_api/group" filter="!test"/>
@@ -229,10 +225,6 @@
     <unit bldFile="classicui_plat/custom_cursors_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_settings_api" name="Screensaver Settings API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_settings_api/screensaver_settings_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_settings_api/group"/>
-   </component>
    <component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/global_window_priorities_api/global_window_priorities_api.metaxml"/>
     <unit bldFile="classicui_plat/global_window_priorities_api/group"/>
@@ -273,10 +265,6 @@
     <unit bldFile="classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_runtime_api" name="Screensaver Runtime API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_runtime_api/screensaver_runtime_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_runtime_api/group"/>
-   </component>
    <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/extended_scroller_api/extended_scroller_api.metaxml"/>
     <unit bldFile="classicui_plat/extended_scroller_api/group"/>
@@ -499,10 +487,12 @@
     <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
     <unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60">
+   <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60,test,api_test">
     <meta rel="Api" href="classicui_pub/screen_saver_api/screen_saver_api.metaxml"/>
-    <unit bldFile="classicui_pub/screen_saver_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+    <meta rel="testbuild">
+       <group name="classicui_pub_api_tests"/>
+    </meta>
+    <unit bldFile="classicui_pub/screen_saver_api/tsrc/group"/>
    </component>
    <component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
     <meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>