# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266411572 0
# Node ID 8ae69391a51ae1e1cbeaf61f9efe8762f003bc31
# Parent  a2f4ff5ed9dd9745e0e262456fcbf2cf9b1866bf
More fixed conditional cases

diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -109,7 +109,7 @@
             <unit bldFile="/sf/app/homescreen/idlehomescreen/data/group"/>
           </component>
           <component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-            <!-- can the loc file be moved to another comopnent and this one removed?f -->
+            <!-- can the loc file be moved to another comopnent and this one removed? -->
             <unit bldFile="/sf/app/homescreen/idlehomescreen/group"/>
           </component>
           <component name="homescreen_test" filter="s60,test" purpose="development" long-name="Home Screen Apps Test">
diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/homescreen/package_definition_3.0.xml
--- a/symbian3/app/homescreen/package_definition_3.0.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/homescreen/package_definition_3.0.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -37,7 +37,7 @@
         <unit bldFile="idlehomescreen/data/group"/>
       </component>
       <component id="idlehomescreen_build" filter="s60" name="Idle Home Screen Build">
-      	<!-- can the loc file be moved to another comopnent and this one removed?f -->
+      	<!-- can the loc file be moved to another comopnent and this one removed? -->
         <unit bldFile="idlehomescreen/group"/>
       </component>
       <component id="homescreen_test" filter="s60,test" purpose="development" name="Home Screen Apps Test">
diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/screensaver/package_definition.xml
--- a/symbian3/app/screensaver/package_definition.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/screensaver/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -78,17 +78,18 @@
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
         <!-- is this a user-facing application or a daemon? -->
+        <!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
         <collection name="scrsaver" long-name="Screen Saver" level="plugin">
           <component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
             <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-            <unit bldFile="/sf/app/screensaver/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
-            <unit bldFile="/sf/app/screensaver/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>
+            <!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
           </component>
           <component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-            <unit bldFile="/sf/app/screensaver/scrsaver/scrsaverplugins/SlideshowPlugin/group"/>
+            <!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/>       -->
           </component>
           <component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-            <unit bldFile="/sf/app/screensaver/scrsaver/screensaveraiwplugin/group"/>
+            <!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
           </component>
         </collection>
         <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/screensaver/package_definition_3.0.xml
--- a/symbian3/app/screensaver/package_definition_3.0.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/screensaver/package_definition_3.0.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -2,6 +2,8 @@
 <SystemDefinition schema="3.0.0">
   <package id="screensaver" name="Screen Saver Apps" levels="plugin ui">
   	<!-- is this a user-facing application or a daemon? -->
+
+	<!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
     <collection id="scrsaver" name="Screen Saver" level="plugin">
       <meta rel="config">
       	<not-defined condition="TOOLS"/>
@@ -12,20 +14,21 @@
       		<defined condition="__SERIES60_NATIVE_BROWSER"/>
       	</meta>
       		<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
-        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>
+        
+		<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
       </component>
       <component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
       	<meta rel="config">
       		<defined condition="__SLIDESHOW_SCREENSAVER "/>
       	</meta>
-        <unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/>        
+        <!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/>       -->
       </component>
       <component id="screensaveraiwplugin" filter="s60" name="Screen Saver AIW Plugin" class="plugin">
       	<meta rel="config">
       		<defined condition="RD_SCREENSAVERAIWPLUGIN  "/>
       	</meta>
-        <unit bldFile="scrsaver/screensaveraiwplugin/group"/>
+        <!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
       </component>
     </collection>
     <collection id="screensaver_info" name="Screen Saver Apps Info" level="ui">
diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -91,7 +91,8 @@
             <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
           </component>
           <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-            <unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
+            <!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+            <!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
           </component>
           <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
             <!--  can this be put into the other components? -->
diff -r a2f4ff5ed9dd -r 8ae69391a51a symbian3/app/speechsrv/package_definition_3.0.xml
--- a/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Feb 17 12:52:00 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Feb 17 12:59:32 2010 +0000
@@ -18,7 +18,8 @@
       	<meta rel="config">
       		<defined condition="__VCOMMAND_CONTROL_PANEL"/>
       	</meta>
-        <unit bldFile="voiceui/vccontrolpanelplugin/group"/>
+		<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+        <!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
       </component>
       <component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
       	<!--  can this be put into the other components? -->