# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266494845 0
# Node ID fa78a5cdd72427b60c550ab2e24c48068a3b0ea8
# Parent  ad0db2ef7168b1b0f6a589af60e2a37695898c0b
Merge changes

diff -r ad0db2ef7168 -r fa78a5cdd724 symbian3/app/camera/package_definition_3.0.xml
--- a/symbian3/app/camera/package_definition_3.0.xml	Thu Feb 18 12:05:17 2010 +0000
+++ b/symbian3/app/camera/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
@@ -7,6 +7,7 @@
       </component>
       <component id="cameraapp" filter="s60" name="Camera Application">
         <unit bldFile="camerauis/cameraapp/group"/>
+        <unit bldFile="camerauis/cameraapp/help/group"/>
       </component>
     </collection>
     <collection id="camera_info" name="Camera Apps Info">
diff -r ad0db2ef7168 -r fa78a5cdd724 symbian3/app/videotelephony/package_definition_3.0.xml
--- a/symbian3/app/videotelephony/package_definition_3.0.xml	Thu Feb 18 12:05:17 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
@@ -3,7 +3,7 @@
   <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
     <collection id="vtengines" name="Video Telephony Engines" level="engine">
       <component id="videoteleng" filter="s60" name="Video Telephony Engine">
-        <unit bldFile="vtengines/videoteleng/group"/>
+        <unit bldFile="vtengines/videoteleng/Group"/>
       </component>
       <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
         <unit bldFile="vtengines/vtmediatorplugin/group"/>
@@ -16,10 +16,10 @@
     </collection>
     <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
       <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
-        <unit bldFile="vtprotocolplugins/displaysink/group"/>
+        <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
       </component>
       <component id="videosource" filter="s60" name="Video Source" introduced="^2">
-        <unit bldFile="vtprotocolplugins/videosource/group"/>
+        <unit bldFile="vtprotocolplugins/VideoSource/group"/>
       </component>
     </collection>
     <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
diff -r ad0db2ef7168 -r fa78a5cdd724 symbian3/mw/mmmw/package_definition_3.0.xml
--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 12:05:17 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
@@ -41,6 +41,9 @@
       <component id="metadatautility" filter="s60" name="Metadata Utility">
         <unit bldFile="mmserv/metadatautility/group"/>
       </component>
+      <component id="3gpextparserstub" filter="sf_build" name="3GPExt Parser Stub">
+        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
+      </component>
       <component id="radioutility" filter="s60" name="Radio Utility">
         <unit bldFile="mmserv/radioutility/group"/>
       </component>
diff -r ad0db2ef7168 -r fa78a5cdd724 symbian3/mw/securitysrv/package_definition_3.0.xml
--- a/symbian3/mw/securitysrv/package_definition_3.0.xml	Thu Feb 18 12:05:17 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
@@ -30,7 +30,7 @@
         <unit bldFile="pkiutilities/devicetoken/group"/>
       </component>
       <component id="certificates" filter="s60" name="Certificates">
-        <unit bldFile="pkiutilities/certificates/group" filter="sf_build"/>
+        <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
       </component>
       <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
       	<!-- need to split this into the above components -->
diff -r ad0db2ef7168 -r fa78a5cdd724 symbian3/mw/uiresources/package_definition_3.0.xml
--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Thu Feb 18 12:05:17 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
@@ -43,6 +43,9 @@
       <component id="aknicon" filter="s60" name="Avkon Icon Framework">
         <unit bldFile="uigraphics/aknicon/group"/>
       </component>
+      <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+        <unit bldFile="uigraphics/nvgrenderstage/group"/> 
+      </component>
     </collection>
     <collection id="layouts" name="Layouts" level="plugin">
       <component id="cdl" filter="s60" name="Customization Definition Language">