--- a/symbian3/app/printing/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/app/printing/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,109 +1,31 @@
 <?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="printing" level="services" long-name="Printing" levels="app">
-        <collection name="DirectPrint" long-name="DirectPrint" level="app">
-          <component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
-            <unit bldFile="/sf/app/printing/DirectPrint/DirectPrintApp/group"/>
-          </component>
-          <component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
-            <unit bldFile="/sf/app/printing/DirectPrint/DirectPrintServer/group"/>
-          </component>
-          <component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
-            <unit bldFile="/sf/app/printing/DirectPrint/DirectPrintClient/group"/>
-          </component>
-        </collection>
-        <collection name="imageprint" long-name="ImagePrint" level="app">
-          <component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
-            <unit bldFile="/sf/app/printing/imageprint/clog/group"/>
-          </component>
-          <component name="imageprintengine" filter="s60" long-name="ImagePrint Engine" introduced="^2">
-            <unit bldFile="/sf/app/printing/imageprint/imageprintengine/group"/>
-          </component>
-          <component name="imageprintui" filter="s60" long-name="ImagePrint UI" introduced="^2">
-            <unit bldFile="/sf/app/printing/imageprint/imageprintui/group"/>
-          </component>
-          <component name="imageprint_build" filter="s60" long-name="ImagePrint Build" introduced="^2">
-            <!--  Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
-            <unit bldFile="/sf/app/printing/imageprint/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="printing" name="Printing" levels="app">
+    <collection id="DirectPrint" name="DirectPrint" level="app">
+      <component id="DirectPrintApp" filter="sf_build" name="DirectPrint App" introduced="^3">
+        <unit bldFile="DirectPrint/DirectPrintApp/group"/>
+      </component>
+      <component id="DirectPrintServer" filter="sf_build" name="DirectPrint Server" introduced="^3">
+        <unit bldFile="DirectPrint/DirectPrintServer/group"/>
+      </component>
+      <component id="DirectPrintClient" filter="sf_build" name="DirectPrint Client" introduced="^3">
+        <unit bldFile="DirectPrint/DirectPrintClient/group"/>
+      </component>
+    </collection>
+    <collection id="imageprint" name="ImagePrint" level="app">
+      <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
+        <unit bldFile="imageprint/clog/group"/>
+      </component>
+      <component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
+        <unit bldFile="imageprint/imageprintengine/group"/>
+      </component>
+      <component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
+        <unit bldFile="imageprint/imageprintui/group"/>
+      </component>
+      <component id="imageprint_build" filter="s60" name="ImagePrint Build" introduced="^2">	
+      	<!--  Need to break the IBY includes into the other components, or remove #includes and make this a ROM component -->
+        <unit bldFile="imageprint/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>