--- a/symbian3/app/screensaver/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/app/screensaver/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,104 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <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="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<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"/>
+      </meta>    
+      <component id="scrsaverplugins" filter="s60" name="Screen Saver Plugins" class="plugin">
+      	<meta rel="config">
+      		<not-defined condition="__SERIES60_30__"/>
+      		<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/"/>-->
-          </component>
-          <component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
-            <!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/>       -->
-          </component>
-          <component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
-            <!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
-          </component>
-        </collection>
-        <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
-          <component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
-            <!--the app should be a separate component -->
-            <unit bldFile="/sf/app/screensaver/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+      </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"/>       -->
+      </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"/>-->
+      </component>
+    </collection>
+    <collection id="screensaver_info" name="Screen Saver Apps Info" level="ui">
+      <component id="screensaver_build" filter="s60" name="Screen Saver Application">
+     		<!--the app should be a separate component --> 
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>