# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1273580407 -3600
# Node ID b0597a809c02ad2d72ab0cba4a7610732cec1575
# Parent  6e408d4334b44f0e067a90e9a80da54bffdbc44e
Correct podcatcher package definition, and move to the Multimedia Apps part of the root sysdef (S^3 and S^4)

diff -r 6e408d4334b4 -r b0597a809c02 symbian3/app/podcatcher/package_definition_3.0.xml
--- a/symbian3/app/podcatcher/package_definition_3.0.xml	Mon May 10 16:53:30 2010 +0100
+++ b/symbian3/app/podcatcher/package_definition_3.0.xml	Tue May 11 13:20:07 2010 +0100
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="podcatcher" name="Podcatcher" levels="app">
-    <collection id="podcatcher" name="Podcatcher" level="app">
-      <component id="podcatcher_build" filter="s60" name="Podcatcher Build">
-        <!-- has exports from top level bld.inf -->
+    <collection id="podcatcher_info" name="Podcatcher" level="app">
+      <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
         <unit bldFile="group"/> 
       </component>
-      <component id="podcatcher_app" filter="s60" name="Podcatcher Application">
-        <unit bldFile="application/group"/>
-      </component>
-      <component id="podcatcher_engine" filter="s60" name="Podcatcher Engine">
-        <unit bldFile="engine/group"/>
-      </component>
     </collection>
   </package>
 </SystemDefinition>
diff -r 6e408d4334b4 -r b0597a809c02 symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Mon May 10 16:53:30 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue May 11 13:20:07 2010 +0100
@@ -205,6 +205,7 @@
       <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition_3.0.xml"/>
       <package id="radio" level="apps" tech-domain="ma" href="../../../../app/radio/package_definition_3.0.xml"/>
       <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
+      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
       <package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
       <package id="voicerec" level="apps" tech-domain="ma" href="../../../../app/voicerec/package_definition_3.0.xml"/>
       <package id="screensaver" level="apps" tech-domain="ui" href="../../../../app/screensaver/package_definition_3.0.xml"/>
@@ -219,7 +220,6 @@
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>
       <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition_3.0.xml"/>
       <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition_3.0.xml"/>
-      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
     </layer>
   </systemModel>
 </SystemDefinition>
diff -r 6e408d4334b4 -r b0597a809c02 symbian4/app/podcatcher/package_definition_3.0.xml
--- a/symbian4/app/podcatcher/package_definition_3.0.xml	Mon May 10 16:53:30 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition_3.0.xml	Tue May 11 13:20:07 2010 +0100
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="podcatcher" name="Podcatcher" levels="app">
-    <collection id="podcatcher" name="Podcatcher" level="app">
-      <component id="podcatcher_build" filter="s60" name="Podcatcher Build">
-        <!-- has exports from top level bld.inf -->
+    <collection id="podcatcher_info" name="Podcatcher" level="app">
+      <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
         <unit bldFile="group"/> 
       </component>
-      <component id="podcatcher_app" filter="s60" name="Podcatcher Application">
-        <unit bldFile="application/group"/>
-      </component>
-      <component id="podcatcher_engine" filter="s60" name="Podcatcher Engine">
-        <unit bldFile="engine/group"/>
-      </component>
     </collection>
   </package>
 </SystemDefinition>
diff -r 6e408d4334b4 -r b0597a809c02 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Mon May 10 16:53:30 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue May 11 13:20:07 2010 +0100
@@ -206,6 +206,7 @@
       <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition_3.0.xml"/>
       <package id="radio" level="apps" tech-domain="ma" href="../../../../app/radio/package_definition_3.0.xml"/>
       <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition_3.0.xml"/>
+      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
       <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition_3.0.xml"/>
       <package id="homescreentools" level="services" tech-domain="ui" href="../../../../app/homescreentools/package_definition_3.0.xml"/>
       <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
@@ -213,7 +214,6 @@
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>
       <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition_3.0.xml"/>
       <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition_3.0.xml"/>
-      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition_3.0.xml"/>
     </layer>
   </systemModel>
 </SystemDefinition>