--- a/symbian3/app/commonemail/package_definition.xml	Wed Mar 03 12:50:03 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Wed Mar 03 13:31:47 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="app" long-name="Applications" levels="services apps">
@@ -180,7 +180,7 @@
             <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
           </component>
           <component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-            <!-- can the exports be broken up into the other components ?
+            <!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
             <unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
           </component>
@@ -215,6 +215,9 @@
           <component name="email_plat" filter="s60" long-name="Email Apps Platform Interfaces" class="api">
             <unit bldFile="/sf/app/commonemail/email_plat/group"/>
           </component>
+          <component name="email_pub" filter="s60" long-name="Email Apps Public Interfaces" class="api">
+            <unit bldFile="/sf/app/commonemail/email_pub/group"/>
+          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/app/commonemail/package_definition_3.0.xml	Wed Mar 03 12:50:03 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Wed Mar 03 13:31:47 2010 +0000
@@ -142,6 +142,9 @@
       <component id="email_plat" filter="s60" class="api" name="Email Apps Platform Interfaces">
         <unit bldFile="email_plat/group"/>
       </component>
+      <component id="email_pub" filter="s60" class="api" name="Email Apps Public Interfaces">
+        <unit bldFile="email_pub/group"/>
+      </component>
     </collection>
   </package>
 </SystemDefinition>

--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Mar 03 12:50:03 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Wed Mar 03 13:31:47 2010 +0000
@@ -213,7 +213,7 @@
       <package id="graphicsuis" level="services" tech-domain="ui" href="../../../../app/graphicsuis/package_definition_3.0.xml"/>
       <package id="profile" level="apps" tech-domain="ui" href="../../../../app/profile/package_definition_3.0.xml"/>
       <package id="speechsrv" level="services" tech-domain="ui" href="../../../../app/speechsrv/package_definition_3.0.xml"/>
-      <package id="homescreentools" level="services" tech-domain="ui"  href="../../../../tools/homescreentools/package_definition_3.0.xml"/>
+      <package id="homescreentools" level="services" tech-domain="ui"  href="../../../../app/homescreentools/package_definition_3.0.xml"/>
       <package id="webuis" level="services" tech-domain="rt" href="../../../../app/webuis/package_definition_3.0.xml"/>
       <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
       <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition_3.0.xml"/>