# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1273506940 -3600
# Node ID 40c9f7e9027e0e8f1027c897586fefbead507266
# Parent  2cd4c637654030a8b65449d948eb316b37c0b922
Update system model and SVGs with podcatcher (Bug 1831)

diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Mon May 10 16:55:40 2010 +0100
@@ -11511,6 +11511,20 @@
 </component>
 </collection>
 </package>
+<package id="podcatcher" level="apps" tech-domain="ma" 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 -->
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+<component id="podcatcher_app" filter="s60" name="Podcatcher Application">
+<unit bldFile="/app/podcatcher/application/group"/>
+</component>
+<component id="podcatcher_engine" filter="s60" name="Podcatcher Engine">
+<unit bldFile="/app/podcatcher/engine/group"/>
+</component>
+</collection>
+</package>
 </layer>
 </systemModel>
 </SystemDefinition>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Mon May 10 16:55:40 2010 +0100
@@ -14808,8 +14808,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
-  <g class="layer-detail" transform="translate(761.8999999999987 3.2)">
-   <rect x="-749.0999999999988" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
+  <g class="layer-detail" transform="translate(746.8999999999987 3.2)">
+   <rect x="-734.0999999999988" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -19941,6 +19941,34 @@
       </g>
      </g>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 3576.6000000000004 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
+     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
+     <g transform="translate(0 3.2)">
+      <g id="podcatcher" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Podcatcher</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="podcatcher_build" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Podcatcher Build</text>
+        </g>
+        <g id="podcatcher_app" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Podcatcher Application</text>
+        </g>
+        <g id="podcatcher_engine" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Podcatcher Engine</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
    </g>
   </g>
  </g>
@@ -19995,7 +20023,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (10)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (11)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
@@ -20077,9 +20105,9 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
-     <tspan dy="-1em" x="265.17499999999995">109 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">661 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2904 Components</tspan>
+     <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
+     <tspan dy="1em" x="265.17499999999995">662 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2907 Components</tspan>
     </text>
    </g>
   </g>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/sf3c.svg
--- a/symbian3/single/sysdefs/sf3c.svg	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Mon May 10 16:55:40 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1370.8999999999999 689.5597784394387" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1400.8999999999999 690.4687448452171" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -431,8 +431,8 @@
  <g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(62.449999999999974 3.2)">
-   <rect x="-49.64999999999998" class="layer" y="-3.2" width="1348.4999999999998" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(77.44999999999997 3.2)">
+   <rect x="-64.64999999999998" class="layer" y="-3.2" width="1378.4999999999998" height="231.26000000000002"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -1512,8 +1512,8 @@
  <g id="mw" transform="translate(3.1999999999999993 178.06)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-  <g class="layer-detail" transform="translate(31.69999999999975 3.2)">
-   <rect x="-18.89999999999975" class="layer" y="-3.2" width="1348.4999999999998" height="222.8"/>
+  <g class="layer-detail" transform="translate(46.69999999999975 3.2)">
+   <rect x="-33.89999999999975" class="layer" y="-3.2" width="1378.4999999999998" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -3303,7 +3303,7 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="1348.4999999999998" height="174.86"/>
+   <rect x="0" class="layer" y="-3.2" width="1378.4999999999998" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -4518,10 +4518,22 @@
       </g>
      </g>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 1350.5999999999997 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
+     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
+     <g transform="translate(0 3.2)">
+      <g id="podcatcher" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Podcatcher</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1071.9795 641.7200000000001) translate(295.7205 0) scale(3.6999802178070165) translate(-295.7205)">
+ <g id="legend-root" class="legend" transform="translate(1101.9795 641.7200000000001) translate(295.7205 0) scale(3.781137932608662) translate(-295.7205)">
   <text text-anchor="middle" class="title" x="279.38525000000004" y="0">
    <tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
    <tspan dy="1em" x="279.38525000000004">System Model</tspan>
@@ -4572,7 +4584,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="46" y="3.0999999999999996"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (10)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (11)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="61.5" y="3.0999999999999996"/>
@@ -4589,8 +4601,8 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
-     <tspan dy="-0.5em" x="243.275">109 Packages</tspan>
-     <tspan dy="1em" x="243.275">661 Collections</tspan>
+     <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
+     <tspan dy="1em" x="243.275">662 Collections</tspan>
     </text>
    </g>
   </g>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Mon May 10 16:55:40 2010 +0100
@@ -13189,8 +13189,8 @@
  <g id="app" transform="translate(3.1999999999999993 25.2)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="189.43"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
-  <g class="layer-detail" transform="translate(824.8999999999992 3.2)">
-   <rect x="-812.0999999999992" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
+  <g class="layer-detail" transform="translate(807.1999999999991 3.2)">
+   <rect x="-794.3999999999992" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -17545,6 +17545,23 @@
       </g>
      </g>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 3249.600000000002 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Podcatcher</text>
+     <g transform="translate(0 3.2)">
+      <g id="application" transform="translate(0 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">application</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="engine" transform="translate(17.7 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">engine</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
    </g>
   </g>
  </g>
@@ -17613,7 +17630,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (8)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (9)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
@@ -17686,8 +17703,8 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
-     <tspan dy="-1em" x="250.875">108 Packages</tspan>
-     <tspan dy="1em" x="250.875">599 Collections</tspan>
+     <tspan dy="-1em" x="250.875">109 Packages</tspan>
+     <tspan dy="1em" x="250.875">601 Collections</tspan>
      <tspan dy="1em" x="250.875">2541 Components</tspan>
     </text>
    </g>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/sf3pkg.svg
--- a/symbian3/single/sysdefs/sf3pkg.svg	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Mon May 10 16:55:40 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2102.899999999999 686.7023744025573" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2182.999999999999 688.8196960149995" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -431,8 +431,8 @@
  <g id="os" transform="translate(3.1999999999999993 395.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">OS</text>
-  <g class="layer-detail" transform="translate(333.19999999999976 3.2)">
-   <rect x="-320.39999999999975" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(373.2499999999997 3.2)">
+   <rect x="-360.4499999999997" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -566,8 +566,8 @@
  <g id="mw" transform="translate(3.1999999999999993 169.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(52.84999999999995 3.2)">
+   <rect x="-40.049999999999955" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -864,7 +864,7 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="166.4"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="166.4" height="9.3" x="-83.5">Applications</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2080.499999999999" height="166.4"/>
+   <rect x="0" class="layer" y="-3.2" width="2160.599999999999" height="166.4"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -1106,10 +1106,16 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="116.00000000000001">Techview</text>
      <g transform="translate(0 3.2)"/>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 2082.599999999999 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
+     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Podcatcher</text>
+     <g transform="translate(0 3.2)"/>
+    </g>
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1806.8894999999993 624.8000000000001) translate(292.8105 0) scale(5.736679524812121) translate(-292.8105)">
+ <g id="legend-root" class="legend" transform="translate(1886.9894999999992 624.8000000000001) translate(292.8105 0) scale(5.955524135917256) translate(-292.8105)">
   <text text-anchor="middle" class="title" x="276.47525" y="0">
    <tspan dy="0.75em" x="276.47525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="276.47525">System Model</tspan>
@@ -1160,7 +1166,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="154.5" y="-0.0000000000000002220446049250313"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (10)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (11)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="170" y="-0.0000000000000002220446049250313"/>
@@ -1177,7 +1183,7 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="241.82" y="1.5499999999999998">
-     <tspan dy="0em" x="241.82">109 Packages</tspan>
+     <tspan dy="0em" x="241.82">110 Packages</tspan>
     </text>
    </g>
   </g>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Mon May 10 16:55:40 2010 +0100
@@ -10119,13 +10119,6 @@
 </component>
 </collection>
 </block>
-<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
-  <collection name="podcatcher" long-name="Podcatcher" level="app">
-    <component name="podcatcher" filter="s60" long-name="Podcatcher Build" introduced="^3">
-      <unit bldFile="app/podcatcher/group"/>
-    </component>
-  </collection>
-</block>
 <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
 <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
 <component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
@@ -10802,6 +10795,20 @@
 </component>
 </collection>
 </block>
+<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+<collection name="podcatcher" long-name="Podcatcher" level="app">
+<component name="podcatcher_build" filter="s60" long-name="Podcatcher Build">
+<!-- has exports from top level bld.inf -->
+<unit bldFile="app/podcatcher/group"/>
+</component>
+<component name="podcatcher_app" filter="s60" long-name="Podcatcher Application">
+<unit bldFile="app/podcatcher/application/group"/>
+</component>
+<component name="podcatcher_engine" filter="s60" long-name="Podcatcher Engine">
+<unit bldFile="app/podcatcher/engine/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
diff -r 2cd4c6376540 -r 40c9f7e9027e symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Mon May 10 16:04:42 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Mon May 10 16:55:40 2010 +0100
@@ -10486,13 +10486,6 @@
 </component>
 </collection>
 </package>
-<package id="podcatcher" level="apps" name="Podcatcher" levels="app">
-  <collection id="podcatcher" name="Podcatcher" level="app">
-    <component id="podcatcher_build" filter="s60" name="Podcatcher Build">
-      <unit bldFile="group"/>
-    </component>
-  </collection>
-</package>
 <package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
 <collection id="musicplayer_plat" name="Music Player Apps Platform Interfaces" level="app">
 <component id="mpx_music_player_app_api" name="MPX Music Player App API" class="api" filter="s60">
@@ -11267,6 +11260,20 @@
 </component>
 </collection>
 </package>
+<package id="podcatcher" level="apps" tech-domain="ma" 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 -->
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+<component id="podcatcher_app" filter="s60" name="Podcatcher Application">
+<unit bldFile="/app/podcatcher/application/group"/>
+</component>
+<component id="podcatcher_engine" filter="s60" name="Podcatcher Engine">
+<unit bldFile="/app/podcatcher/engine/group"/>
+</component>
+</collection>
+</package>
 </layer>
 </systemModel>
 </SystemDefinition>