--- a/symbian3/os/graphics/package_definition.xml	Thu Feb 18 13:04:45 2010 +0000
+++ b/symbian3/os/graphics/package_definition.xml	Thu Feb 18 13:16:29 2010 +0000
@@ -135,11 +135,9 @@
           </component>
         </collection>
         <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-          <component name="graphics_plat" filter="s60" long-name="Graphics Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/graphics/graphics_plat/group"/>
-          </component>
-          <component name="graphics_pub" filter="s60" long-name="Graphics Public Interfaces" class="api">
-            <unit bldFile="/sf/os/graphics/graphics_pub/group"/>
+          <component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
+            <unit bldFile="/sf/os/graphics/graphics_plat/m3g_core_api/group"/>
+            <!-- cope with missing graphics_plat/group -->
           </component>
           <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
             <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
@@ -173,6 +171,9 @@
           <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
             <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
           </component>
+          <component name="opengles_stub" filter="sf_build" long-name="OpenGL ES Stub" purpose="optional" introduced="^2">
+            <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
+          </component>
         </collection>
         <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
           <component name="openvginterface" long-name="OpenVG Interface" introduced="^2" purpose="optional">
@@ -182,6 +183,9 @@
             <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
             <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
           </component>
+          <component name="sfopenvg" filter="sf_build" long-name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+            <unit bldFile="/sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
+          </component>
         </collection>
         <collection name="egl" long-name="EGL" level="internal-adaptations">
           <component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">

--- a/symbian3/os/graphics/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml	Thu Feb 18 13:16:29 2010 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
@@ -59,12 +59,6 @@
       </component>
     </collection>
     <collection id="graphics_info" name="Graphics Info" level="app-if">
-      <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
-        <unit bldFile="graphics_plat/group"/>
-      </component>
-      <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
-        <unit bldFile="graphics_plat/group"/>
-      </component>
       <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
         <unit bldFile="graphics_plat/m3g_core_api/group"/> <!-- cope with missing graphics_plat/group -->
       </component>
@@ -100,7 +94,7 @@
       <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
         <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
       </component>
-      <component id="opengles_stub" filter="sf_build" name="OpenGL ES stub" purpose="optional">
+      <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
         <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
       </component>
     </collection>
@@ -112,7 +106,7 @@
      	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
         <unit bldFile="openvg/openvginterface/group/openvg11"/>
       </component>
-      <component id="khropenvgri" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+      <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
         <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
       </component>
     </collection>