--- a/camcordermmfplugin/mediarecorder/traces/CCMRMDFVideoRecorderTraces.h	Mon Mar 15 12:41:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: CCMRMDFVideoRecorderTraces.h
-*
-*/
-// Created by TraceCompiler 1.0.27
-// DO NOT EDIT, CHANGES WILL BE LOST
-
-#ifndef __CCMRMDFVIDEORECORDERTRACES_H__
-#define __CCMRMDFVIDEORECORDERTRACES_H__
-
-#define KOstTraceComponentID 0x101f8507
-
-#define CCMRVIDEORECORDER_MDVRONEWBUFFERS 0x40001
-
-
-inline TBool OstTraceGen2( TUint32 aTraceID, TInt aParam1, TInt aParam2 )
-    {
-    TBool retval = BTrace8( KBTraceCategoryOpenSystemTrace, EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
-    if ( retval )
-        {
-        TUint8 data[ 8 ];
-        TUint8* ptr = data;
-        *( ( TInt* )ptr ) = aParam1;
-        ptr += sizeof ( TInt );
-        *( ( TInt* )ptr ) = aParam2;
-        ptr += sizeof ( TInt );
-        ptr -= 8;
-        retval = OstSendNBytes( KBTraceCategoryOpenSystemTrace, EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
-        }
-    return retval;
-    }
-
-inline TBool OstTraceGen2( TUint32 aTraceID, TInt32 aParam1, TInt32 aParam2 )
-    {
-    TBool retval = BTrace8( KBTraceCategoryOpenSystemTrace, EOstTraceActivationQuery, KOstTraceComponentID, aTraceID );
-    if ( retval )
-        {
-        TUint8 data[ 8 ];
-        TUint8* ptr = data;
-        *( ( TInt* )ptr ) = aParam1;
-        ptr += sizeof ( TInt );
-        *( ( TInt* )ptr ) = aParam2;
-        ptr += sizeof ( TInt );
-        ptr -= 8;
-        retval = OstSendNBytes( KBTraceCategoryOpenSystemTrace, EOstTrace, KOstTraceComponentID, aTraceID, ptr, 8 );
-        }
-    return retval;
-    }
-
-
-#endif
-
-// End of file
-

--- a/package_definition.xml	Mon Mar 15 12:41:16 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="camerasrv" name="Camera Services" levels="plugin fw api">
-    <collection id="camappengine" name="Camera App Engine" level="fw">
-      <component id="stillconverter" filter="s60" name="Still Image Converter">
-        <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-      </component>
-      <component id="camappengine_engine" filter="s60" name="Camera App Engine">
-		<!-- should separate this from parent engine's bld.inf  -->
-        <!-- <unit bldFile="camappengine/engine/group"/> -->
-      </component>
-      <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
-        <unit bldFile="camappengine/asynchfilesavequeue/group"/>
-		<!-- should next bld.inf be #included in previous? -->
-        <!-- <unit bldFile="camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
-        <unit bldFile="camappengine/build"/>
-      </component>
-    </collection>
-    <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
-      <component id="mediarecorder" filter="s60" name="Camcorder Media Recorder">
-        <!-- <unit bldFile="camcordermmfplugin/mediarecorder/group"/> -->
-      </component>
-      <component id="filecomposer" filter="s60" name="File Composer">
-        <!-- <unit bldFile="camcordermmfplugin/filecomposer/group"/> -->
-      </component>
-      <component id="camcordermmfplugin_controller" filter="s60" name="Camcorder Controller MMF Plugin" class="plugin">
-        <!-- <unit bldFile="camcordermmfplugin/controller/group"/> -->
-      </component>
-      <component id="camcordermmfplugin_test" filter="s60" name="Camcorder MMF Plugin Test" purpose="development">
-        <!-- <unit bldFile="camcordermmfplugin/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build">
-		<!-- should split this into individual bld.inf files for the above components, or collapse all into a single component? -->
-        <unit bldFile="camcordermmfplugin/build"/>
-      </component>
-    </collection>
-    <collection id="configmanagers" name="Config Managers" level="api">
-      <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
-        <unit bldFile="configmanagers/imagingconfigmanager/group"/>
-		<!-- should this test be #included in the above? -->
-        <!-- <unit bldFile="configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
-      </component>
-    </collection>
-    <collection id="camerasrv_info" name="Camera Services Info" level="api">
-      <component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
-        <unit bldFile="camerasrv_plat/group"/>
-		<!-- should below tests be #included? -->
-        <!-- <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-        <!-- <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
-        <!-- <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
-        <!-- <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group"/> -->
-      </component>
-      <component id="camerasrv_build" filter="s60" name="Camera Services Build">
-		<!-- should split into individual bld.infs -->
-        <unit bldFile="group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>