--- a/symbian4/mw/vpnclient/package_definition_3.0.xml	Wed May 26 17:18:20 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="vpnclient" name="VPN Client" levels="engine ui api">
-  <!-- is the !oem_build filter needed? -->
-  <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
-      <component id="vpnapi" filter="s60" class="api" name="VPN API">
-		<meta rel="Api" href="vpnc_plat/vpnapi/vpn_api.metaxml"/>
-        <unit bldFile="vpnc_plat/vpnapi/group"/>
-      </component>
-  </collection>
-  <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-   <component id="vpnapi_impl" filter="s60" name="VPN API">
-    <unit bldFile="vpnapiimpl/group"/>
-   </component>
-  </collection>
-  <collection id="vpnengine" name="VPN Engine" level="engine">
-   <!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-   <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
-    <unit bldFile="vpnengine/eventmediatorapi/group"/>
-   </component>
-   <component id="eventviewer" filter="s60" name="Event Viewer">
-    <unit bldFile="vpnengine/eventviewer/group"/>
-   </component>
-   <component id="vpnins" filter="s60" name="VPN Installer">
-    <unit bldFile="vpnengine/vpnins/group"/>
-   </component>
-   <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
-    <unit bldFile="vpnengine/ikepolparser/group"/>
-   </component>
-   <component id="utlbase64" filter="s60" name="Base64 Utilities">
-    <unit bldFile="vpnengine/utlbase64/group"/>
-   </component>
-   <component id="utlcrypto" filter="s60" name="Crypto Utilities">
-    <unit bldFile="vpnengine/utlcrypto/group"/>
-   </component>
-   <component id="utlxml" filter="s60" name="XML Utilities">
-    <unit bldFile="vpnengine/utlxml/group"/>
-   </component>
-   <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
-    <unit bldFile="vpnengine/utlpkcs10/group"/>
-   </component>
-   <component id="pkiserviceapi" filter="s60" name="PKI Service API">
-    <unit bldFile="vpnengine/pkiserviceapi/group"/>
-   </component>
-   <component id="ikecert" filter="s60" name="IKE Certificate Management">
-    <unit bldFile="vpnengine/ikecert/group"/>
-   </component>
-   <component id="kmdapi" filter="s60" name="Key Management Daemon API">
-    <unit bldFile="vpnengine/kmdapi/group"/>
-   </component>
-   <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
-    <unit bldFile="vpnengine/kmdserver/group"/>
-   </component>
-   <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
-    <unit bldFile="vpnengine/ikeutils/group"/>
-   </component>
-   <component id="ikev1lib" filter="s60" name="IKEv1 Library">
-    <unit bldFile="vpnengine/ikev1lib/group"/>
-   </component>
-   <component id="ikev2lib" filter="s60" name="IKEv2 Library">
-    <unit bldFile="vpnengine/ikev2lib/group"/>
-   </component>
-   <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
-    <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
-   </component>
-   <component id="sit" filter="s60" name="Socket Interaction Thread">
-    <unit bldFile="vpnengine/sit/group"/>
-   </component>
-   <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
-    <unit bldFile="vpnengine/vpntcwrapper/group"/>
-   </component>
-   <component id="eventmediator" filter="s60" name="Event Mediator">
-    <unit bldFile="vpnengine/eventmediator/group"/>
-   </component>
-   <component id="pkiservice" filter="s60" name="PKI Service">
-    <unit bldFile="vpnengine/pkiservice/group"/>
-   </component>
-   <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
-    <unit bldFile="vpnengine/vpnconnagt/group"/>
-   </component>
-   <component id="vpnmanager" filter="s60" name="VPN Manager">
-    <unit bldFile="vpnengine/vpnmanager/group"/>
-   </component>
-   <component id="vpncleaner" filter="s60" name="VPN Cleaner">
-    <unit bldFile="vpnengine/vpncleaner/group"/>
-   </component>
-   <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
-    <unit bldFile="vpnengine/utlpkcs12/group"/>
-   </component>
-   <component id="dmadengine" filter="s60" name="DM Adapter Engine">
-    <unit bldFile="vpnengine/dmadengine/group"/>
-   </component>
-   <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadipsecvpn/group"/>
-   </component>
-   <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadpki/group"/>
-   </component>
-   <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
-    <unit bldFile="vpnengine/ikesocket/group"/>
-   </component>
-  </collection>
-  <collection id="vpnui" name="VPN UI" level="ui">
-   <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
-    <unit bldFile="vpnui/vpnecomnotifier/group"/>
-   </component>
-   <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
-    <unit bldFile="vpnui/vpndialogmanager/group"/>
-   </component>
-   <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
-    <unit bldFile="vpnui/vpnpolins/group"/>
-   </component>
-   <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
-    <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
-   </component>
-  </collection>
-  <collection id="vpnclient_info" name="VPN Client Info" level="api">
-   <component id="vpnclient_help" filter="s60" name="VPN Client Help">
-    <unit bldFile="help/group"/>
-   </component>
-   <component id="vpnclient_build" filter="s60" name="VPN Client Build">
-    <!-- should split this up into the other components and remove this-->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
- </package>
-</SystemDefinition>