# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1258738261 0
# Node ID b2d4e75d4645f2ffdddd8317c01623e6ee9c11ab
# Parent  efb6440d30ae459404dab808e32d35820f48e04d# Parent  c01205272202c5d23cf5f24705a86266c2025988
catchup merge

diff -r efb6440d30ae -r b2d4e75d4645 .hgtags
--- a/.hgtags	Fri Nov 20 17:29:23 2009 +0000
+++ b/.hgtags	Fri Nov 20 17:31:01 2009 +0000
@@ -6,3 +6,4 @@
 b26a6e1e71136c78c1f545299c42ce23e389b636 PDK_2.0.0
 0c2ae79cc4287669d26ac0c479272a5d1b0078e8 PDK_3.0.b
 4d217173fa4ed82a7d289d1391205a8c58938cb7 PDK_3.0.c
+4d217173fa4ed82a7d289d1391205a8c58938cb7 PDK_2.0.1
diff -r efb6440d30ae -r b2d4e75d4645 symbian2/single/sysdefs/system_model.xml
--- a/symbian2/single/sysdefs/system_model.xml	Fri Nov 20 17:29:23 2009 +0000
+++ b/symbian2/single/sysdefs/system_model.xml	Fri Nov 20 17:31:01 2009 +0000
@@ -649,6 +649,9 @@
      <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
      </component>
+     <component id="browserrootcertificates" name="Browser Root Certificates" introduced="symbian^2" purpose="optional">
+       <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+     </component>
      <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
      </component>
diff -r efb6440d30ae -r b2d4e75d4645 symbian2/split/sysdefs/system_model_os.xml
--- a/symbian2/split/sysdefs/system_model_os.xml	Fri Nov 20 17:29:23 2009 +0000
+++ b/symbian2/split/sysdefs/system_model_os.xml	Fri Nov 20 17:31:01 2009 +0000
@@ -671,6 +671,9 @@
 <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional">
 <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
 </component>
+      <component id="browserrootcertificates" name="Browser Root Certificates" introduced="symbian^2" purpose="optional">
+        <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+      </component>
 <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
 <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
 </component>
diff -r efb6440d30ae -r b2d4e75d4645 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Fri Nov 20 17:29:23 2009 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Nov 20 17:31:01 2009 +0000
@@ -642,6 +642,9 @@
      <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
      </component>
+     <component id="browserrootcertificates" name="Browser Root Certificates" introduced="symbian^2" purpose="optional">
+      <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+     </component>
      <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/security/cryptoservices/asnpkcs/group" mrp="os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
      </component>
diff -r efb6440d30ae -r b2d4e75d4645 symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Fri Nov 20 17:29:23 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Fri Nov 20 17:31:01 2009 +0000
@@ -440,6 +440,9 @@
 <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
 <unit bldFile="os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
 </component>
+      <component id="browserrootcertificates" name="Browser Root Certificates" introduced="symbian^2" purpose="optional">
+        <unit mrp="os\security\cryptoservices\browserrootcertificates\browserrootcerts.mrp"/>
+      </component>
 <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
 <unit bldFile="os\security\cryptoservices\asnpkcs\group" mrp="os\security\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
 </component>
@@ -1388,6 +1391,30 @@
 </collection>
 </block>
 <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
+<component name="vgi" long-name="VGI" origin-model="foundation">
+  <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
+</component>
+</collection>
+<collection name="m3g" long-name="M3G" level="internal-adaptations">
+<component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
+  <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
+</component>
+</collection>
+<collection name="openWF" long-name="OpenWF" > <!-- for NGA graphics drop -->
+<component name="openwfcinterface" long-name="openwfcinterface">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" /> <!-- OpenWF header files -->
+</component>
+<component name="openwfcompositionengine" long-name="openwfcompositionengine">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" /> <!-- OpenWF composition engine implementation -->
+</component>
+<component name="openwfsupport" long-name="openwfsupport">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" /> <!-- OpenWF Adaptation features specific to the Symbian architecture -->
+</component>
+<component name="surfaceupdate" long-name="surfaceupdate">
+  <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" /> <!-- Surface content changes server -->
+</component>
+</collection>
 <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
 <component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
 <unit bldFile="os\graphics\graphicsresourceservices\graphicsresource\group" mrp="os\graphics\graphicsresourceservices\graphicsresource\group\graphics_graphicsresource.mrp"/>
@@ -1430,6 +1457,9 @@
 <!-- intentionally not for the foundation despite being a mandatory component -->
 <unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
 </component>
+     <component name="windowserverplugins" long-name="Window Server Plugins" purpose="mandatory" plugin="Y" origin-model="Symbian">
+      <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" /> <!--Added for NGA - Plugins for the windowserver -->
+     </component>
 </collection>
 <collection name="printingservices" long-name="Printing Services" level="app-if">
 <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
@@ -1453,11 +1483,20 @@
 <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
 </component>
+<component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>  <! -- possibly should not be building this every time? ->
+</component>
 </collection>
 <collection name="egl" long-name="EGL" level="internal-adaptations">
 <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
 </component>
+<component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+ <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/" />  <!-- for NGA graphics drop -->
+</component>
+<component name="n:eglswitch" long-name="EGL Emulator Switch">
+ <unit bldFile="/sf/os/graphics/egl/eglswitch/group/" />  <!-- for NGA graphics drop -->
+</component>
 </collection>
 <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
 <component name="gdi" long-name="GDI" purpose="mandatory">
@@ -2396,4 +2435,4 @@
     <task><buildLayer command="abld -check build" targetList="armv5smp" unitParallel="Y" targetParallel="Y"/></task>
   </configuration>
 <!-- tb101sf configuration -->
-</SystemBuild></SystemDefinition>
\ No newline at end of file
+</SystemBuild></SystemDefinition>