--- a/symbian3/mw/videoutils/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/videoutils/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,55 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!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>
+ <!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>
+ <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
+ <!ATTLIST SystemBuild schema CDATA #REQUIRED>
+ <!ELEMENT list (ref+)>
+ <!ATTLIST list
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT ref EMPTY>
+ <!ATTLIST ref item CDATA #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y|N) #REQUIRED>
+ <!ELEMENT configuration (listRef+|ref+|task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
+ <!ELEMENT listRef EMPTY>
+ <!ATTLIST listRef list CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y|N) #REQUIRED
+  targetParallel (Y|N) 'N'>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  root CDATA #IMPLIED
+  command CDATA #REQUIRED>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
-    <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="commonrecordingengine" long-name="Common Recording Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/group"/>
-     </component>
-     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
-     </component>
-     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/group"/>
-     </component>
-    </collection>
-    <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
-     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoconnutility/connutilpsworker/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoconnutility/group"/>
-     </component>
-    </collection>
-    <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="schedulerclient" long-name="Scheduler Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
-     </component>
-     <component name="schedulerserver" long-name="Scheduler Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group"/>
-     </component>
-     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/group"/>
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
-     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoutils_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/group"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="videoutils">
+<collection name="s60">
+<component name="videoutils">
+<unit bldFile="/sf/mw/videoutils/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>