--- a/symbian3/mw/imghandling/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/imghandling/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,47 +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="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
-    <collection name="3gplibrary" long-name="3GP Library" level="server">
-     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/group"/>
-      <!-- <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/3gplibrary/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="ihl" long-name="IHL" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
-     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
-     </component>
-     <component name="imagepreview" long-name="Image Preview" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/imagepreview/group"/>
-     </component>
-     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-     </component>
-     <component name="tvoutengine" long-name="TV Out Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
-     </component>
-    </collection>
-    <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/imghandling/imagehandling_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/group"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="imghandling">
+<collection name="s60">
+<component name="imghandling">
+<unit bldFile="/sf/mw/imghandling/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>