# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274953965 -10800
# Node ID 3a35f7917fa6d5eb980d1647c5f70f16e18952ab
# Parent  8b7f4ea6a3e215fe4c4e0be8b30ee5703bbfcd47
Revision: 201021
Kit: 2010121

diff -r 8b7f4ea6a3e2 -r 3a35f7917fa6 package_definition_v2.xml
--- a/package_definition_v2.xml	Fri May 14 15:53:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="techview" name="Techview" levels="services ui utils apps1 apps2 apps3">
-    <collection id="buildverification" name="Build Verification" level="services">
-     <component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-        <unit bldFile="buildverification/autosmoketest/Group" mrp="buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-      </component>
-      <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
-        <unit bldFile="buildverification/smoketest/Group" mrp="buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-      </component>
-    </collection>
-    <collection id="techviewplat" name="Techview Platform" level="services">
-      <component id="techviewuiklaf" name="UIKLAF" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/techviewuiklaf/GROUP" mrp="techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
-      </component>
-      <component id="eikstdtv" name="EIKSTD" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/eikstd/group" mrp="techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
-      </component>
-      <component id="feps" name="FEPS" filter="techview" purpose="development">
-        <unit bldFile="techviewplat/feps/group" mrp="techviewplat/feps/group/techview_feps.mrp"/>
-      </component>
-    </collection>
-    <collection id="techviewui" name="Techview UI" level="ui">
-      <component id="techviewextras" name="Extras" filter="techview" purpose="development">
-        <unit bldFile="techviewui/techviewextras/group" mrp="techviewui/techviewextras/group/techview_extras.mrp"/>
-      </component>
-      <component id="statuspane" name="Status Pane" filter="techview" purpose="development">
-        <unit bldFile="techviewui/statuspane/group" mrp="techviewui/statuspane/group/techview_statuspane.mrp"/>
-      </component>
-      <component id="shell" name="Shell" filter="techview" purpose="development">
-        <unit bldFile="techviewui/shell/group" mrp="techviewui/shell/group/techview_shell.mrp"/>
-      </component>
-      <component id="startuptv" name="Techview Startup" filter="techview" purpose="development">
-        <unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
-      </component>
-    </collection>
-    <collection id="controlpanel" name="Control Panel" level="ui">
-      <component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
-      </component>
-      <component id="cctlcolscheme" name="Colour Scheme Control" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/cctlcolscheme/group" mrp="controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
-      </component>
-      <component id="soundsetup" name="Sound Setup" filter="techview" purpose="development">
-        <unit bldFile="controlpanel/soundsetup/group" mrp="controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
-      </component>
-      <component id="keyclickref" name="Key Click Ref" filter="techview" purpose="development" class="plugin">
-        <unit bldFile="controlpanel/keyclickref/Group" mrp="controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
-      </component>
-    </collection>
-    <collection id="pimapps" name="PIM Apps" level="apps3">
-      <component id="contacui" name="Contacts UI" filter="techview" purpose="development">
-        <unit bldFile="pimapps/contacui/group" mrp="pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
-      </component>
-      <component id="agenda" name="Agenda UI" filter="techview" purpose="development">
-        <unit bldFile="pimapps/agenda/group" mrp="pimapps/agenda/group/techview_agenda.mrp"/>
-      </component>
-      <component id="contactstechview" name="Contacts" filter="techview" purpose="development">
-        <unit bldFile="pimapps/contactstechview/group" mrp="pimapps/contactstechview/group/techview_contacts.mrp"/>
-      </component>
-    </collection>
-    <collection id="securityapps" name="Security Apps" level="apps3">
-      <component id="secuitv" name="Techview Security UI" filter="techview" purpose="development">
-        <unit bldFile="securityapps/secui/group" mrp="securityapps/secui/group/techview_secui.mrp"/>
-      </component>
-      <component id="securityupstechview" name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
-        <unit bldFile="securityapps/securityupstechview/group" mrp="securityapps/securityupstechview/group/security_ups_techview.mrp"/>
-      </component>
-    </collection>
-    <collection id="utilityapps" name="Utility Apps" level="apps2">
-      <component id="helptechview" name="Help" filter="techview" purpose="development">
-        <unit bldFile="utilityapps/helptechview/group" mrp="utilityapps/helptechview/group/techview_help.mrp"/>
-      </component>
-      <component id="timew" name="World Time" filter="techview" purpose="development">
-        <unit bldFile="utilityapps/timew/group" mrp="utilityapps/timew/group/techview_timew.mrp"/>
-      </component>
-      <component id="cpumonitor" name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
-        <unit bldFile="utilityapps/cpumonitor/group" mrp="utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
-      </component>
-    </collection>
-    <collection id="installationapps" name="Installation Apps" level="apps2">
-      <component id="installapp" name="Install App" filter="techview" purpose="development">
-        <unit bldFile="installationapps/installapp/group" mrp="installationapps/installapp/group/techview_installapp.mrp"/>
-      </component>
-    </collection>
-    <collection id="messagingapps" name="Messaging Apps" level="apps2">
-      <component id="messagingui" name="Messaging UI" filter="techview" purpose="development">
-        <unit bldFile="messagingapps/messagingui/Group" mrp="messagingapps/messagingui/Group/techview_messagingui.mrp"/>
-      </component>
-    </collection>
-    <collection id="telephonyapps" name="Telephony Apps" level="apps1">
-      <component id="techviewphoneui" name="Phone UI" filter="techview" purpose="development">
-        <unit bldFile="telephonyapps/techviewphoneui/group" mrp="telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingapps" name="Networking Apps" level="apps1">
-      <component id="iapstatusapp" name="IAP Status App" filter="techview" purpose="development">
-        <unit bldFile="networkingapps/iapstatusapp/group" mrp="networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
-      </component>
-      <component id="networkingagentnotifier" name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" class="plugin">
-        <unit bldFile="networkingapps/networkingagentnotifier/group" mrp="networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
-      </component>
-      <component id="techviewvpnui" name="VPN UI" filter="techview" introduced="7.0" purpose="development">
-        <unit bldFile="networkingapps/techviewvpnui/group" mrp="networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
-      </component>
-    </collection>
-    <collection id="networkingutils" name="Networking Utils" level="utils">
-      <component id="ipadministrationtool" name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="networkingutils/ipadministrationtool/group"/>
-      </component>
-      <component id="nameresolverutility" name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="networkingutils/nameresolverutility/group"/>
-      </component>
-    </collection>
-    <collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
-      <component id="techviewusbui" name="USB UI" filter="techview" purpose="development">
-        <unit bldFile="shortlinkapps/techviewusbui/group" mrp="shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
-      </component>
-      <component id="bluetoothui" name="Bluetooth UI" filter="techview" purpose="development">
-        <unit bldFile="shortlinkapps/bluetoothui/group" mrp="shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
-      </component>
-      <component id="reftsp" name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" class="plugin">
-		<unit bldFile="shortlinkapps/reftsp/group" mrp="shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
-      </component>
-    </collection>
-    <collection id="testapps" name="Test Apps" level="utils">
-      <component id="simpleapp" name="Simple App" filter="techview" purpose="development">
-        <unit bldFile="testapps/simpleapp/group" mrp="testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
-      </component>
-      <component id="statdevice" name="STAT Device" filter="techview" purpose="development">
-        <unit bldFile="../../os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="../../os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
-      </component>
-      <component id="rschandlerui" name="Resource Handler UI" filter="techview" purpose="development">
-        <unit bldFile="testapps/rschandler/TVResourceHandler/group" mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
-      </component>
-      <component id="graphicstestutils" name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
-        <unit bldFile="testapps/graphicstestutils/group" mrp="testapps/graphicstestutils/group/graphics_testutils.mrp"/>
-      </component>
-      <component id="rschandler" name="Resource Handler" deprecated="^3" purpose="development" filter="test">
-        <unit mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="testapps/rschandler/TVResourceHandler/group"/>
-      </component>
-    </collection>
-    <collection id="avapps" name="A/V Apps" level="apps3">
-      <component id="techviewaudio" name="Audio" filter="techview" purpose="development">
-        <unit bldFile="avapps/techviewaudio/Group" mrp="avapps/techviewaudio/Group/techview_audio.mrp"/>
-      </component>
-    </collection>
-    <collection id="toolkit" name="Toolkit" level="utils">
-      <component id="romkit" name="ROM Kit" filter="techview" purpose="development">
-        <unit bldFile="toolkit/romkit/group" mrp="toolkit/romkit/group/techview_romkit.mrp"/>
-      </component>
-      <component id="romimages" name="ROM Images" filter="techview" purpose="development">
-        <unit version="tb101sf" bldFile="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys" mrp="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb101sfrom_obys/reference_roms_tb101sf.mrp"/>
-      </component>
-      <component id="configfiles" name="Configuration Files" filter="techview" purpose="development">
-        <unit mrp="toolkit/configfiles/techview_epoc_ini.mrp"/>
-      </component>
-
-    </collection>
-    <collection id="techview_info" name="Techview Info" level="apps3">
-      <component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="techview_info/techview_metadata/techview_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 8b7f4ea6a3e2 -r 3a35f7917fa6 techview_info/techview_metadata/techview_metadata.mrp
--- a/techview_info/techview_metadata/techview_metadata.mrp	Fri May 14 15:53:27 2010 +0300
+++ b/techview_info/techview_metadata/techview_metadata.mrp	Thu May 27 12:52:45 2010 +0300
@@ -18,6 +18,5 @@
 source   \sf\app\techview\techview_info\techview_metadata 
 source   \sf\app\techview\package_definition.xml
 source   \sf\app\techview\distribution.policy.s60
-source   \sf\app\techview\package_definition_v2.xml
 notes_source      \component_defs\release.src
 ipr T