# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1260359867 0
# Node ID b43c73b88658f1ecb600d24102fc9d4621030fd0
# Parent  0f4f00318d20366accefcc6ddf647b22982df1b4
Fix models for packages whose package_definition file did not match </block>

diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/camera/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,16 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="camera" level="apps" long-name="Camera Apps"/>
+<block name="camera" level="apps" long-name="Camera Apps">
+<collection name="s60">
+<component name="camera">
+<unit bldFile="/sf/app/camera/group" mrp=""/>
+</component>
+<component name="camera_help">
+<unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="commonemail" level="apps" long-name="Email Apps"/>
+<block name="commonemail" level="apps" long-name="Email Apps">
+<collection name="s60">
+<component name="commonemail">
+<unit bldFile="/sf/app/commonemail/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/contentcontrol/package_definition.xml
--- a/symbian3/app/contentcontrol/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/contentcontrol/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="contentcontrol" level="services" long-name="Content Control Daemons"/>
+<block name="contentcontrol" level="services" long-name="Content Control Daemons">
+<collection name="s60">
+<component name="contentcontrol">
+<unit bldFile="/sf/app/contentcontrol/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/conversations/package_definition.xml
--- a/symbian3/app/conversations/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="conversations" level="apps" long-name="Conversation Apps"/>
+<block name="conversations" level="apps" long-name="Conversation Apps">
+<collection name="s60">
+<component name="conversations">
+<unit bldFile="/sf/app/conversations/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/devicecontrol/package_definition.xml
--- a/symbian3/app/devicecontrol/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/devicecontrol/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="devicecontrol" level="services" long-name="Device Control Daemons"/>
+<block name="devicecontrol" level="services" long-name="Device Control Daemons">
+<collection name="s60">
+<component name="devicecontrol">
+<unit bldFile="/sf/app/devicecontrol/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/dictionary/package_definition.xml
--- a/symbian3/app/dictionary/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/dictionary/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="dictionary" level="services" long-name="Dictionary"/>
+<block name="dictionary" level="services" long-name="Dictionary">
+<collection name="s60">
+<component name="dictionary">
+<unit bldFile="/sf/app/dictionary/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/files/package_definition.xml
--- a/symbian3/app/files/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/files/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="files" level="apps" long-name="File Manager Apps"/>
+<block name="files" level="apps" long-name="File Manager Apps">
+<collection name="s60">
+<component name="files">
+<unit bldFile="/sf/app/files/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/gallery/package_definition.xml
--- a/symbian3/app/gallery/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/gallery/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="gallery" level="apps" long-name="Gallery Apps"/>
+<block name="gallery" level="apps" long-name="Gallery Apps">
+<collection name="s60">
+<component name="gallery">
+<unit bldFile="/sf/app/gallery/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/graphicsuis/package_definition.xml
--- a/symbian3/app/graphicsuis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/graphicsuis/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="graphicsuis" level="services" long-name="Graphics UIs"/>
+<block name="graphicsuis" level="services" long-name="Graphics UIs">
+<collection name="s60">
+<component name="graphicsuis">
+<unit bldFile="/sf/app/graphicsuis/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreen" level="apps" long-name="Home Screen Apps"/>
+<block name="homescreen" level="apps" long-name="Home Screen Apps">
+<collection name="s60">
+<component name="homescreen">
+<unit bldFile="/sf/app/homescreen/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/im/package_definition.xml
--- a/symbian3/app/im/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/im/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="im" level="apps" long-name="Instant Messaging Apps"/>
+<block name="im" level="apps" long-name="Instant Messaging Apps">
+<collection name="s60">
+<component name="im">
+<unit bldFile="/sf/app/im/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/imgvieweruis/package_definition.xml
--- a/symbian3/app/imgvieweruis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/imgvieweruis/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="imgvieweruis" level="services" long-name="Image Viewer UIs"/>
+<block name="imgvieweruis" level="services" long-name="Image Viewer UIs">
+<collection name="s60">
+<component name="imgvieweruis">
+<unit bldFile="/sf/app/imgvieweruis/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/iptelephony/package_definition.xml
--- a/symbian3/app/iptelephony/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/iptelephony/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="iptelephony" level="apps" long-name="IP Telephony"/>
+<block name="iptelephony" level="apps" long-name="IP Telephony">
+<collection name="s60">
+<component name="iptelephony">
+<unit bldFile="/sf/app/iptelephony/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/java/package_definition.xml
--- a/symbian3/app/java/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/java/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,16 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="java" level="services" long-name="Java"/>
+<block name="java" level="services" long-name="Java">
+<collection name="s60">
+<component name="java_java_plat">
+<unit bldFile="/sf/app/java/java_plat/group" mrp=""/>
+</component>
+<component name="java_java_stubs">
+<unit bldFile="/sf/app/java/java_stubs/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/location/package_definition.xml
--- a/symbian3/app/location/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/location/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps"/>
+<block name="location" level="apps" long-name="Location Apps">
+<collection name="s60">
+<component name="location">
+<unit bldFile="/sf/app/location/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/mmsharinguis/package_definition.xml
--- a/symbian3/app/mmsharinguis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs"/>
+<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs">
+<collection name="s60">
+<component name="mmsharinguis">
+<unit bldFile="/sf/app/mmsharinguis/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="musicplayer" level="apps" long-name="Music Player Apps"/>
+<block name="musicplayer" level="apps" long-name="Music Player Apps">
+<collection name="s60">
+<component name="musicplayer">
+<unit bldFile="/sf/app/musicplayer/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/phone/package_definition.xml
--- a/symbian3/app/phone/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/phone/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="phone" level="apps" span="2" long-name="Phone Apps"/>
+<block name="phone" level="apps" span="2" long-name="Phone Apps">
+<collection name="s60">
+<component name="phone">
+<unit bldFile="/sf/app/phone/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/photos/package_definition.xml
--- a/symbian3/app/photos/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/photos/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="photos" level="apps" long-name="Photos"/>
+<block name="photos" level="apps" long-name="Photos">
+<collection name="s60">
+<component name="photos">
+<unit bldFile="/sf/app/photos/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/printing/package_definition.xml
--- a/symbian3/app/printing/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/printing/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="printing" level="services" long-name="Printing"/>
+<block name="printing" level="services" long-name="Printing">
+<collection name="s60">
+<component name="printing">
+<unit bldFile="/sf/app/printing/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/profile/package_definition.xml
--- a/symbian3/app/profile/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/profile/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="profile" level="apps" long-name="Profile"/>
+<block name="profile" level="apps" long-name="Profile">
+<collection name="s60">
+<component name="profile">
+<unit bldFile="/sf/app/profile/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/radio/package_definition.xml
--- a/symbian3/app/radio/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/radio/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="radio" level="apps" long-name="Radio Apps"/>
+<block name="radio" level="apps" long-name="Radio Apps">
+<collection name="s60">
+<component name="radio">
+<unit bldFile="/sf/app/radio/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/rndtools/package_definition.xml
--- a/symbian3/app/rndtools/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/rndtools/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,16 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="rndtools" level="services" long-name="RD tools"/>
+<block name="rndtools" level="services" long-name="RD tools">
+<collection name="s60">
+<component name="tools_rndtools_htiui">
+<unit bldFile="/sf/app/rndtools/htiui/group" mrp=""/>
+</component>
+<component name="rndtools">
+<unit bldFile="/sf/app/rndtools/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/screensaver/package_definition.xml
--- a/symbian3/app/screensaver/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/screensaver/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="screensaver" level="apps" long-name="Screen Saver Apps"/>
+<block name="screensaver" level="apps" long-name="Screen Saver Apps">
+<collection name="s60">
+<component name="screensaver">
+<unit bldFile="/sf/app/screensaver/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/settingsuis/package_definition.xml
--- a/symbian3/app/settingsuis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/settingsuis/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="settingsuis" level="services" long-name="Settings UIs"/>
+<block name="settingsuis" level="services" long-name="Settings UIs">
+<collection name="s60">
+<component name="settingsuis">
+<unit bldFile="/sf/app/settingsuis/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/speechsrv/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs"/>
+<block name="speechsrv" level="services" long-name="Speech Recognition UIs">
+<collection name="s60">
+<component name="speechsrv">
+<unit bldFile="/sf/app/speechsrv/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/utils/package_definition.xml
--- a/symbian3/app/utils/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/utils/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="utils" level="apps" long-name="Utility Apps"/>
+<block name="utils" level="apps" long-name="Utility Apps">
+<collection name="s60">
+<component name="utils">
+<unit bldFile="/sf/app/utils/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/videoplayer/package_definition.xml
--- a/symbian3/app/videoplayer/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/videoplayer/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="videoplayer" level="apps" long-name="Video Player Apps"/>
+<block name="videoplayer" level="apps" long-name="Video Player Apps">
+<collection name="s60">
+<component name="videoplayer">
+<unit bldFile="/sf/app/videoplayer/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/videotelephony/package_definition.xml
--- a/symbian3/app/videotelephony/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/videotelephony/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,31 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps"/>
+<block name="videotelephony" level="apps" long-name="Video Telephony Apps">
+<collection name="s60">
+<component name="videotelephony_plat">
+<unit bldFile="/sf/app/videotelephony/videotelephony_plat/group" mrp=""/>
+</component>
+<component name="vtprotocolsstub">
+<unit bldFile="/sf/app/videotelephony/vtprotocolsstub/group" mrp=""/>
+</component>
+<component name="DisplaySink">
+<unit bldFile="/sf/app/videotelephony/vtprotocolplugins/DisplaySink/group" mrp=""/>
+</component>
+<component name="VideoSource">
+<unit bldFile="/sf/app/videotelephony/vtprotocolplugins/VideoSource/group" mrp=""/>
+</component>
+<component name="videoteleng">
+<unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/Group" mrp=""/>
+</component>
+<component name="videotelui">
+<unit bldFile="/sf/app/videotelephony/vtuis/videotelui/group" mrp=""/>
+</component>
+<component name="vtmediatorplugin">
+<unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/voicerec/package_definition.xml
--- a/symbian3/app/voicerec/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/voicerec/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps"/>
+<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
+<collection name="s60">
+<component name="voicerec">
+<unit bldFile="/sf/app/voicerec/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file
diff -r 0f4f00318d20 -r b43c73b88658 symbian3/app/webuis/package_definition.xml
--- a/symbian3/app/webuis/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
+++ b/symbian3/app/webuis/package_definition.xml	Wed Dec 09 11:57:47 2009 +0000
@@ -97,7 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="webuis" level="services" long-name="Web UIs"/>
+<block name="webuis" level="services" long-name="Web UIs">
+<collection name="s60">
+<component name="webuis">
+<unit bldFile="/sf/app/webuis/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file