# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1267532384 0
# Node ID 92aad91b04df15f2bec8f94212f12665ad8d1c4f
# Parent  f935cd69ee529e1bc6478bee8fd74708f87d1e36
Minor cosmetic changes and comments

diff -r f935cd69ee52 -r 92aad91b04df symbian3/adaptation/stubs/package_definition.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/adaptation/stubs/package_definition.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,78 +1,78 @@
 <?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
->
-]>
+<!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^3" schema="2.0.1">
   <systemModel>
     <layer name="adaptation" long-name="Adaptation" levels="low mw high">
diff -r f935cd69ee52 -r 92aad91b04df symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -76,7 +76,7 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
-      <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw apps">
+      <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
         <collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
           <component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
             <unit bldFile="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
@@ -131,7 +131,7 @@
             <unit bldFile="/sf/app/homescreen/menufw/group"/>
           </component>
         </collection>
-        <collection name="taskswitcher" long-name="Task Switcher" level="apps">
+        <collection name="taskswitcher" long-name="Task Switcher" level="support">
           <component name="contextengine" filter="s60" long-name="Context Engine" introduced="^3">
             <unit bldFile="/sf/app/homescreen/taskswitcher/contextengine/group"/>
           </component>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/app/homescreen/package_definition_3.0.xml
--- a/symbian3/app/homescreen/package_definition_3.0.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/app/homescreen/package_definition_3.0.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="homescreen" name="Home Screen Apps" levels="fw apps">
+  <package id="homescreen" name="Home Screen Apps" levels="fw support apps">
     <collection id="idlehomescreen" name="Idle Home Screen" level="apps">
       <component id="nativeuicontroller" filter="s60" name="Native UI Controller">
         <unit bldFile="idlehomescreen/nativeuicontroller/group"/>
@@ -59,7 +59,7 @@
         <unit bldFile="menufw/group"/>
       </component>
     </collection>
-    <collection id="taskswitcher" name="Task Switcher" level="apps">
+    <collection id="taskswitcher" name="Task Switcher" level="support">
       <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
         <unit bldFile="taskswitcher/contextengine/group"/>
       </component>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/app/videoplayer/package_definition.xml
--- a/symbian3/app/videoplayer/package_definition.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,84 +1,84 @@
 <?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
->
-]>
+<!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^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
-      <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support apps">
-        <collection name="videofeeds" long-name="Video Feeds" level="apps">
-          <component name="iptv_utils" filter="s60" long-name="Iptv Util" introduced="^3">
+      <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+        <collection name="videofeeds" long-name="Video Feeds" level="util">
+          <component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videofeeds/utils/group"/>
           </component>
           <component name="viewmessageutility" filter="s60" long-name="View Message Utility" introduced="^3">
@@ -146,7 +146,7 @@
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
           </component>
         </collection>
-        <collection name="videocollection" long-name="Video Collection" level="apps">
+        <collection name="videocollection" long-name="Video Collection" level="util">
           <component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
             <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
           </component>
@@ -169,7 +169,7 @@
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
           </component>
         </collection>
-        <collection name="videoplayer_homescreenplugins" long-name="Videoplayer Homescreen Plugins" level="support">
+        <collection name="videoplayer_homescreenplugins" long-name="Videoplayer Homescreen Plugins" level="plugin">
           <component name="videosuiteconf" filter="s60" long-name="Video Suite Configuration" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/homescreenplugins/videosuiteconf/group"/>
           </component>
@@ -213,7 +213,7 @@
             <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
           </component>
         </collection>
-        <collection name="videoplayback" long-name="Video Playback Plugins" level="support">
+        <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
           <component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group"/>
           </component>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/app/videoplayer/package_definition_3.0.xml
--- a/symbian3/app/videoplayer/package_definition_3.0.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition_3.0.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="videoplayer" name="Video Player Apps" levels="support apps">
-    <collection id="videofeeds" name="Video Feeds" level="apps">
-      <component id="iptv_utils" filter="s60" name="Iptv Util" introduced="^3">
+  <package id="videoplayer" name="Video Player Apps" levels="support plugin util apps">
+    <collection id="videofeeds" name="Video Feeds" level="util">
+      <component id="iptv_utils" filter="s60" name="IPTV Util" introduced="^3">
         <unit bldFile="videofeeds/utils/group"/>
       </component>
       <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
@@ -70,7 +70,7 @@
          <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
        </component>
     </collection>
-    <collection id="videocollection" name="Video Collection" level="apps">
+    <collection id="videocollection" name="Video Collection" level="util">
       <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
         <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
       </component>
@@ -93,7 +93,7 @@
             <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
     </component>
     </collection>
-    <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="support">
+    <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="plugin">
       <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3" >
         <unit bldFile="homescreenplugins/videosuiteconf/group"/>
       </component>
@@ -137,7 +137,7 @@
         <unit bldFile="videoplayerapp/videoplayerlauncher/group"/>
       </component>
     </collection>
-    <collection id="videoplayback" name="Video Playback Plugins" level="support">    
+    <collection id="videoplayback" name="Video Playback Plugins" level="plugin">    
       <component id="videohelix" name="Video Helix"  filter="s60" introduced="^3" class="plugin">
         <unit bldFile="videoplayback/videohelix/group"/>
       </component>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/mw/uiresources/package_definition.xml
--- a/symbian3/mw/uiresources/package_definition.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,78 +1,78 @@
 <?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
->
-]>
+<!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^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
@@ -160,10 +160,10 @@
           <component name="fontprovider" filter="s60" long-name="Font Provider">
             <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
           </component>
-<!-- R&D materials, should be Nokia only
-          <component name="s60_fonts" filter="s60" long-name="S60 Fonts">
-            <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/group"/>
-          </component>
+          <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
           <component name="fontutils" filter="sf_build" long-name="Font Utils">
             <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/mw/uiresources/package_definition_3.0.xml
--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -85,7 +85,7 @@
         <unit bldFile="fontsupport/fontprovider/group"/>
       </component>
 <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s6_fonts" filter="s60" name="S60 Fonts">
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
         <unit bldFile="fontsupport/fontutils/group"/>
       </component>
 -->
diff -r f935cd69ee52 -r 92aad91b04df symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -1,78 +1,78 @@
 <?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
->
-]>
+<!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^3" schema="2.0.1">
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
@@ -145,10 +145,12 @@
           <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
           </component>
-          <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 parser">
+          <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
           </component>
           <component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
           </component>
         </collection>
diff -r f935cd69ee52 -r 92aad91b04df symbian3/os/lbs/package_definition_3.0.xml
--- a/symbian3/os/lbs/package_definition_3.0.xml	Mon Mar 01 14:06:02 2010 +0000
+++ b/symbian3/os/lbs/package_definition_3.0.xml	Tue Mar 02 12:19:44 2010 +0000
@@ -69,10 +69,12 @@
       <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
-      <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 parser">
+      <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
       </component>
       <component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
       </component>
     </collection>