diff -r 1553c141c99f -r 5dfc4b38cad0 3k/os/graphics/package_definition.xml
--- a/3k/os/graphics/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/os/graphics/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" 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">
+     <component name="vgi" long-name="VGI" origin-model="foundation">
       <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
      </component>
-     <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0" origin-model="Foundation"/>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="Foundation"/>
+     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
+     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gcore11" long-name="M3G Core 11" origin-model="Foundation">
+     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
       <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
      </component>
     </collection>
-    <collection name="graphics_pub" long-name="Graphics Public Interfaces" level="app-if">
-     <component unofficial="yes" name="graphics_pub_build" long-name="Graphics Public API Build" origin-model="Foundation">
-      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
-     </component>
-    </collection>
     <collection name="graphicstest" long-name="Graphics Test" level="app-if">
      <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
@@ -29,9 +24,20 @@
      </component>
     </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="Foundation">
+     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
+	  <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
+     </component>
+     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
+     </component>
+     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
       <unit bldFile="/sf/os/graphics/group"/>
      </component>
+     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/os/graphics/graphics_plat/group"/>
+     </component>
     <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
      </component>
@@ -39,14 +45,6 @@
       <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="openvg_binding_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/graphics/graphics_plat/openvg_binding_api/group"/>
-     </component>
-     <component unofficial="yes" name="m3g_core_api" origin-model="Foundation">
-      <unit bldFile="/sf/os/graphics/graphics_plat/m3g_core_api/group"/>
-     </component>
-    </collection>
    <collection name="windowing" long-name="Windowing" level="app-if">
      <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
@@ -70,10 +68,12 @@
       <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
      </component>
      <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="/sf/os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
      </component>
      <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="/sf/os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
      </component>
     </collection>
     <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
@@ -89,7 +89,8 @@
       <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/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/eglimplementation/group/" mrp="/sf/os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
@@ -107,19 +108,13 @@
      </component>
     </collection>
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
+	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
 <!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
      </component>
 -->
     </collection>
     <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-	 <component unofficial="yes" name="graphicssvs" long-name="Graphics Verification Suite" purpose="development" origin-model="Foundation">
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-	  <!-- Unit manually added from OS after auto-merge -->
-	  <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-     </component>
      <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
       <!-- PLACEHOLDER="DS.1645"
       <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>