# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1273580630 -3600
# Node ID 75ae928e56cd7070965653e0d3204a7698ad76be
# Parent  bc552d1328e3bd28ca14a93643a1a3fea4ba241d
Corrections to podcatcher package and updates to SVGs

diff -r bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Tue May 11 13:23:50 2010 +0100
@@ -10769,6 +10769,13 @@
 </collection>
 </package>
 <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+</collection>
+</package>
 <package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
 <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
@@ -11511,20 +11518,6 @@
 </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 bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Tue May 11 13:23:50 2010 +0100
@@ -18844,13 +18844,31 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 3211.5000000000005 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_info" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" 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-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);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>
+      </g>
+     </g>
+    </g>
     <g id="tv" class="package placeholder" transform="translate( 2104.5000000000005 85.83000000000001)">
      <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="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 3211.5000000000005 0)">
+    <g id="voicerec" class="package" transform="translate( 3241.5000000000005 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="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
@@ -18889,7 +18907,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 3267.6000000000004 0)">
+    <g id="screensaver" class="package" transform="translate( 3297.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -18931,7 +18949,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3297.6000000000004 0)">
+    <g id="homescreen" class="package" transform="translate( 3327.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
@@ -19096,7 +19114,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3422.7000000000003 0)">
+    <g id="profile" class="package" transform="translate( 3452.7000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -19788,7 +19806,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 3475.8 0)">
+    <g id="helps" class="package" transform="translate( 3505.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -19829,7 +19847,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3505.8 0)">
+    <g id="techview" class="package" transform="translate( 3535.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -19941,34 +19959,6 @@
       </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>
@@ -20107,7 +20097,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <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>
+     <tspan dy="1em" x="265.17499999999995">2905 Components</tspan>
     </text>
    </g>
   </g>
diff -r bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/sf3c.svg
--- a/symbian3/single/sysdefs/sf3c.svg	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Tue May 11 13:23:50 2010 +0100
@@ -4136,13 +4136,25 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 1078.1999999999998 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_info" 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 id="tv" class="package placeholder" transform="translate( 654.9 85.83000000000001)">
      <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="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 1078.1999999999998 0)">
+    <g id="voicerec" class="package" transform="translate( 1108.1999999999998 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="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
@@ -4164,7 +4176,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1131.2999999999997 0)">
+    <g id="screensaver" class="package" transform="translate( 1161.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -4181,7 +4193,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1161.2999999999997 0)">
+    <g id="homescreen" class="package" transform="translate( 1191.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
@@ -4225,7 +4237,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 1196.6999999999998 0)">
+    <g id="profile" class="package" transform="translate( 1226.6999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -4404,7 +4416,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 1249.7999999999997 0)">
+    <g id="helps" class="package" transform="translate( 1279.7999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -4426,7 +4438,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 1279.7999999999997 0)">
+    <g id="techview" class="package" transform="translate( 1309.7999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -4518,18 +4530,6 @@
       </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>
diff -r bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Tue May 11 13:23:50 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(807.1999999999991 3.2)">
-   <rect x="-794.3999999999992" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
+  <g class="layer-detail" transform="translate(784.8499999999992 3.2)">
+   <rect x="-772.0499999999993" 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"/>
@@ -16736,7 +16736,13 @@
       </g>
      </g>
     </g>
-    <g id="voicerec" class="package" transform="translate( 2919.900000000002 0)">
+    <g id="podcatcher" class="package placeholder" transform="translate( 2919.900000000002 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="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="15.600000000000001">Podcatcher</text>
+     <g transform="translate(0 3.2)"/>
+    </g>
+    <g id="voicerec" class="package" transform="translate( 3000.000000000002 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="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
@@ -16764,13 +16770,13 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package placeholder" transform="translate( 2958.300000000002 0)">
+    <g id="screensaver" class="package placeholder" transform="translate( 3038.400000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3038.400000000002 0)">
+    <g id="homescreen" class="package" transform="translate( 3118.500000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
@@ -16925,7 +16931,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3154.200000000002 0)">
+    <g id="profile" class="package" transform="translate( 3234.300000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
@@ -17473,7 +17479,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 3189.600000000002 0)">
+    <g id="helps" class="package" transform="translate( 3269.700000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
@@ -17508,7 +17514,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3219.600000000002 0)">
+    <g id="techview" class="package" transform="translate( 3299.700000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
@@ -17545,23 +17551,6 @@
       </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>
@@ -17704,7 +17693,7 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <tspan dy="-1em" x="250.875">109 Packages</tspan>
-     <tspan dy="1em" x="250.875">601 Collections</tspan>
+     <tspan dy="1em" x="250.875">599 Collections</tspan>
      <tspan dy="1em" x="250.875">2541 Components</tspan>
     </text>
    </g>
diff -r bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/sf3pkg.svg
--- a/symbian3/single/sysdefs/sf3pkg.svg	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Tue May 11 13:23:50 2010 +0100
@@ -1022,25 +1022,31 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
+    <g id="podcatcher" class="package" transform="translate( 1601.9999999999993 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 id="tv" class="package placeholder" transform="translate( 881.1000000000001 81.60000000000001)">
      <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.19999999999999" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 1601.9999999999993 0)">
+    <g id="voicerec" class="package" transform="translate( 1682.0999999999992 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">Voice Recorder Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1682.0999999999992 0)">
+    <g id="screensaver" class="package" transform="translate( 1762.1999999999991 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1762.1999999999991 0)">
+    <g id="homescreen" class="package" transform="translate( 1842.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="59.6">Home Screen Apps</text>
@@ -1052,7 +1058,7 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Graphics UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="profile" class="package" transform="translate( 1842.299999999999 0)">
+    <g id="profile" class="package" transform="translate( 1922.399999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Profiles</text>
@@ -1094,24 +1100,18 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">R&amp;D tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="helps" class="package" transform="translate( 1922.399999999999 0)">
+    <g id="helps" class="package" transform="translate( 2002.4999999999989 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="78.4">Help Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="techview" class="package" transform="translate( 2002.4999999999989 0)">
+    <g id="techview" class="package" transform="translate( 2082.599999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <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>
diff -r bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Tue May 11 13:23:50 2010 +0100
@@ -10238,6 +10238,13 @@
 </collection>
 </block>
 <block name="internetradio" level="apps" long-name="Internet Radio 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">
+<unit bldFile="app/podcatcher/group"/>
+</component>
+</collection>
+</block>
 <block name="tv" level="services" long-name="TV Apps"/>
 <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
@@ -10795,20 +10802,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_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 bc552d1328e3 -r 75ae928e56cd symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Mon May 10 17:02:28 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Tue May 11 13:23:50 2010 +0100
@@ -10609,6 +10609,13 @@
 </collection>
 </package>
 <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
+<package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
+<collection id="podcatcher_info" name="Podcatcher" level="app">
+<component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
+<unit bldFile="/app/podcatcher/group"/>
+</component>
+</collection>
+</package>
 <package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
 <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
@@ -11260,20 +11267,6 @@
 </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>