--- a/symbian3/os/graphics/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -2,6 +2,12 @@
 <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">
+      <component id="3d_opengl_es_1_1" filter="s60" name="3D OpenGL ES 1.1" introduced="^3">
+        <unit bldFile="graphicsaccelaration/3d_opengl_es_1_1/group"/>
+      </component>
+      <component id="2d_openvg_1_1" filter="s60" name="2D OpenVG 1.1" introduced="^3">
+        <unit bldFile="graphicsaccelaration/2D_OpenVG_1_1/group"/>
+      </component>
       <component id="vgi" filter="s60" name="VGI">
         <unit bldFile="graphicsaccelaration/vgi/group"/>
       </component>
@@ -53,13 +59,12 @@
       </component>
     </collection>
     <collection id="graphics_info" name="Graphics Info" level="app-if">
-      <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
-           <!-- is this a real public API? -->
-        <!-- <unit bldFile="graphics_pub/group"/> -->
-      </component>
       <component id="graphics_plat" filter="s60" name="Graphics Platform Interfaces" class="api">
         <unit bldFile="graphics_plat/group"/>
       </component>
+      <component id="graphics_pub" filter="s60" name="Graphics Public Interfaces" class="api">
+        <unit bldFile="graphics_pub/group"/>
+      </component>
       <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
         <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
       </component>
@@ -98,6 +103,7 @@
         <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
       </component>
       <component id="openvg11" filter="s60" name="OpenVG 1.1">
+     	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
         <unit bldFile="openvg/openvginterface/group/openvg11"/>
       </component>
     </collection>