--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/mw/gstreamer/package_definition.xml	Thu May 20 18:02:59 2010 +0100
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!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>
+ <!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="gstreamer" level="generic"/>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/homescreensrv/package_definition.xml	Thu May 20 18:02:37 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Thu May 20 18:02:59 2010 +0100
@@ -95,18 +95,26 @@
 <component name="contentharvester" filter="s60" long-name="Content Harvester">
 <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
-<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
+<component name="contentpublishingsrv_rom" filter="s60" long-name="Content Publishing Service ROM">
 <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
 </collection>
 <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+<component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
+<unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
+</component>
 <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api"/>
 <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api"/>
-<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
 <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api"/>
 <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api"/>
+<component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
+<component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
+<component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
+<component name="hswidgetmodel_api" long-name="HS Widget Model API" filter="s60" introduced="^4" class="api"/>
+<component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
+<component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
 </collection>
 <collection name="screensavermodel" long-name="Screensaver Model" level="specific">
 <component name="screensavermodel_build" long-name="Screensaver Model Build" introduced="^4">

--- a/symbian4/mw/qt/package_definition.xml	Thu May 20 18:02:37 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Thu May 20 18:02:59 2010 +0100
@@ -74,14 +74,7 @@
 <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
-<collection name="qt_tests" long-name="Qt Tests" level="app">
-<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro"/>
-</component>
-<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
-</component>
-</collection>
+<collection name="qt_tests" long-name="Qt Tests" level="app"/>
 </block>
 </layer>
 </systemModel>