--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/mw/webruntime/package_definition.xml	Tue Apr 20 15:23:40 2010 +0100
@@ -0,0 +1,89 @@
+<?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
+>
+]>
+<SystemDefinition name="Symbian^4" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="webruntime" level="specific" long-name="Web Runtime">
+        <!-- need to break up this package nito collections and components -->
+        <collection name="webruntime_info" long-name="Web Runtime Info">
+          <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
+            <unit bldFile="/sf/mw/webruntime/."/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/mw/webruntime/package_definition_3.0.xml	Tue Apr 20 15:23:40 2010 +0100
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="webruntime" name="Web Runtime">
+	<!-- need to break up this package nito collections and components -->
+    <collection id="webruntime_info" name="Web Runtime Info">
+     <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
+      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+     </component>
+    </collection>
+   </package>
+</SystemDefinition>

--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Apr 20 15:20:20 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Apr 20 15:23:40 2010 +0100
@@ -101,7 +101,7 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
+      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition.xml"/>
       <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
       <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
     </layer>
@@ -165,7 +165,7 @@
       <package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition_3.0.xml"/>
       <package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition_3.0.xml"/>
       <package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition_3.0.xml"/>
-      <package id="hb" level="generic" tech-domain="ui" name="Orbit" href="../../../../mw/hb/package_definition_3.0.xml"/>/>
+      <package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition_3.0.xml"/>/>
       <package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition_3.0.xml"/>
       <package id="svgt" level="generic" tech-domain="ui" href="../../../../mw/svgt/package_definition_3.0.xml"/>
       <package id="uiaccelerator" level="generic" tech-domain="ui" href="../../../../mw/uiaccelerator/package_definition_3.0.xml"/>
@@ -180,14 +180,13 @@
       <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition_3.0.xml"/>
       <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition_3.0.xml"/>
       <package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition_3.0.xml"/>
+      <package id="webruntime" level="specific" tech-domain="rt" href="../../../../mw/webruntime/package_definition_3.0.xml"/>
       <package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition_3.0.xml"/>
       <package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition_3.0.xml"/>
     </layer>
     <layer id="app" name="Applications" levels="services apps">
       <package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition_3.0.xml"/>  <!-- pending removal -->
-      <package id="mmsharinguis" level="services" tech-domain="vc" href="../../../../app/mmsharinguis/package_definition_3.0.xml"/>
       <package id="phone" level="apps" span="2" tech-domain="vc" href="../../../../app/phone/package_definition_3.0.xml"/>
-      <package id="videotelephony" level="apps" tech-domain="vc" href="../../../../app/videotelephony/package_definition_3.0.xml"/>
       <package id="settingsuis" level="services" tech-domain="dm" href="../../../../app/settingsuis/package_definition_3.0.xml"/>
       <package id="contentcontrol" level="services" tech-domain="dm" href="../../../../app/contentcontrol/package_definition_3.0.xml"/>
       <package id="firsttimeuse" level="apps" tech-domain="dm" href="../../../../app/firsttimeuse/package_definition_3.0.xml"/>
@@ -209,7 +208,6 @@
       <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition_3.0.xml"/>
       <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition_3.0.xml"/>
       <package id="homescreentools" level="services" tech-domain="ui" href="../../../../app/homescreentools/package_definition_3.0.xml"/>
-      <package id="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"/>
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>