--- a/symbian4/app/internetradio/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,105 +1,27 @@
 <?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="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
-        <collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
-          <!-- collection is really a component. Move down a dir -->
-          <component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
-            <unit bldFile="/sf/app/internetradio/internetradio2.0/group"/>
-          </component>
-        </collection>
-        <collection name="presetserver" long-name="Preset Server" level="server">
-          <!-- collection is really a component. Move down a dir -->
-          <component name="presetserver_build" long-name="Preset Server Build">
-            <unit bldFile="/sf/app/internetradio/presetserver/group"/>
-          </component>
-        </collection>
-        <collection name="qtinternetradio" long-name="Qt Internet Radio">
-          <component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
-            <!--  Move down a dir or break into components-->
-            <unit bldFile="/sf/app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
-          </component>
-          <component name="qtinternetradio_internal" long-name="Qt Internet Radio Internal" filter="test" class="placeholder">
-            <!-- appears to be missing. Remove? 
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+  <package id="internetradio" name="Internet Radio Apps" levels="engine server ui">
+   <collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
+	<!-- collection is really a component. Move down a dir -->
+    <component id="internetradio2_0_build" name="Internet Radio 2.0 Build">
+      <unit bldFile="internetradio2.0/group"/>
+     </component>
+    </collection>
+    <collection id="presetserver" name="Preset Server" level="server">
+	<!-- collection is really a component. Move down a dir -->
+    <component id="presetserver_build" name="Preset Server Build">
+      <unit bldFile="presetserver/group"/>
+     </component>
+    </collection>
+    <collection id="qtinternetradio" name="Qt Internet Radio">
+    <component id="qtinternetradio_build" name="Qt Internet Radio Build">
+	<!--  Move down a dir or break into components-->
+      <unit bldFile="qtinternetradio"  qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+     <component id="qtinternetradio_internal" name="Qt Internet Radio Internal" filter="test">
+	  <!-- appears to be missing. Remove? 
 	  <unit bldFile="qtinternetradio/internal/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r -config rom"/> -->
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+     </component>
+    </collection>
+  </package>
 </SystemDefinition>