--- a/symbian4/app/podcatcher/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,95 +1,17 @@
 <?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^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
-        <collection name="podcatcher_info" long-name="Podcatcher" level="app">
-          <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
-            <!-- has exports from top level bld.inf -->
-            <unit bldFile="/sf/app/podcatcher/group"/>
-          </component>
-          <component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3">
-            <unit bldFile="/sf/app/podcatcher/application/group"/>
-          </component>
-          <component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3">
-            <unit bldFile="/sf/app/podcatcher/engine/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="podcatcher" name="Podcatcher" levels="app">
+    <collection id="podcatcher_info" name="Podcatcher" level="app">
+      <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+        <!-- has exports from top level bld.inf -->
+        <unit bldFile="group"/> 
+      </component>
+      <component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+        <unit bldFile="application/group"/>
+      </component>
+      <component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+        <unit bldFile="engine/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>