diff -r 29c8f9bc68e1 -r 5960d2d03390 vpnclient_sis/group/nokia_vpn_client_localised_armv5_udeb.pkg --- a/vpnclient_sis/group/nokia_vpn_client_localised_armv5_udeb.pkg Wed Sep 15 13:20:54 2010 +0300 +++ b/vpnclient_sis/group/nokia_vpn_client_localised_armv5_udeb.pkg Wed Oct 13 15:42:16 2010 +0300 @@ -1,5 +1,5 @@ ; -; Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +; 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" @@ -17,7 +17,7 @@ ; LANGUAGES ; - None (English only by default) -&EN,FR,GE,SP,IT,SW,DA,NO,FI,AM,PO,TU,IC,RU,HU,DU,CS,SK,PL,SL,TC,HK,ZH,JA,TH,AR,TL,BG,HR,ET,FA,CF,EL,HE,IN,LV,LT,MS,BP,RO,SR,LS,UK,UR,VI,44,102,103,65 +&EN,FR,GE,SP,IT,SW,DA,NO,FI,AM,PO,TU,IC,RU,HU,DU,CS,SK,PL,SL,TC,HK,ZH,JA,TH,AR,TL,BG,HR,ET,FA,CF,EL,HE,IN,LV,LT,MS,BP,RO,SR,LS,UK,UR,VI,44,102,103 ; INSTALLATION HEADER ; UID of acuagentcrypto @@ -68,7 +68,6 @@ "Nokia VPN client", "Nokia VPN", "Nokia VPN", - "Nokia VPN", "Nokia VPN"}, (0x101F5147),32,08,0124, TYPE=SA, RU @@ -121,7 +120,6 @@ "Series60ProductID", "Series60ProductID", "Series60ProductID", -"Series60ProductID", "Series60ProductID"} ; Product / platform version compatibility - S60 5.2 @@ -173,7 +171,6 @@ "Series60ProductID", "Series60ProductID", "Series60ProductID", -"Series60ProductID", "Series60ProductID"} ; List of localised vendor names - one per language. @@ -224,7 +221,6 @@ "Nokia", "Nokia", "Nokia", -"Nokia", "Nokia"} ; The non-localised, globally unique vendor name (mandatory) @@ -271,11 +267,6 @@ "\epoc32\release\armv5\udeb\dmadpki.dll"-"!:\sys\bin\dmadpki.dll" "\epoc32\data\z\resource\plugins\dmadpki.rsc"-"!:\resource\plugins\dmadpki.rsc" -; Agile Provision -"\epoc32\release\armv5\udeb\agileprovisionws.dll"-"!:\sys\bin\agileprovisionws.dll" - -; VPN EXT API -"\epoc32\release\armv5\udeb\vpnextapi.dll"-"!:\sys\bin\vpnextapi.dll" ; VPN API ( include by platform ) ;"\epoc32\release\armv5\udeb\vpnapi.dll"-"!:\sys\bin\vpnapi.dll" @@ -335,13 +326,64 @@ "\epoc32\data\z\resource\vpnmanagementuirsc.r44" "\epoc32\data\z\resource\vpnmanagementuirsc.r102" "\epoc32\data\z\resource\vpnmanagementuirsc.r103" -"\epoc32\data\z\resource\vpnmanagementuirsc.r65" }-"!:\resource\vpnmanagementuirsc.rsc" ; icon and GS plugin registration file "\epoc32\data\z\resource\apps\vpnmanagementui.mif"-"!:\resource\apps\vpnmanagementui.mif" "\epoc32\data\Z\resource\plugins\vpnmanagementui.rsc"-"!:\resource\plugins\vpnmanagementui.rsc" +; VPN help resources +; Localized help files are missing, thus use only EE +; Help resources should be already in ROM but content can be updated from SIS package +;"\epoc32\data\Z\resource\xhtml\01\0x10200EC4\index.xml"-"!:\resource\xhtml\01\0x10200EC4\index.xml" +;{ +;"\epoc32\data\z\resource\help\vpn.h01" +;"\epoc32\data\z\resource\help\vpn.h02" +;"\epoc32\data\z\resource\help\vpn.h03" +;"\epoc32\data\z\resource\help\vpn.h04" +;"\epoc32\data\z\resource\help\vpn.h05" +;"\epoc32\data\z\resource\help\vpn.h06" +;"\epoc32\data\z\resource\help\vpn.h07" +;"\epoc32\data\z\resource\help\vpn.h08" +;"\epoc32\data\z\resource\help\vpn.h09" +;"\epoc32\data\z\resource\help\vpn.h10" +;"\epoc32\data\z\resource\help\vpn.h13" +;"\epoc32\data\z\resource\help\vpn.h14" +;"\epoc32\data\z\resource\help\vpn.h15" +;"\epoc32\data\z\resource\help\vpn.h16" +;"\epoc32\data\z\resource\help\vpn.h17" +;"\epoc32\data\z\resource\help\vpn.h18" +;"\epoc32\data\z\resource\help\vpn.h25" +;"\epoc32\data\z\resource\help\vpn.h26" +;"\epoc32\data\z\resource\help\vpn.h27" +;"\epoc32\data\z\resource\help\vpn.h28" +;"\epoc32\data\z\resource\help\vpn.h29" +;"\epoc32\data\z\resource\help\vpn.h30" +;"\epoc32\data\z\resource\help\vpn.h31" +;"\epoc32\data\z\resource\help\vpn.h32" +;"\epoc32\data\z\resource\help\vpn.h33" +;"\epoc32\data\z\resource\help\vpn.h37" +;"\epoc32\data\z\resource\help\vpn.h39" +;"\epoc32\data\z\resource\help\vpn.h42" +;"\epoc32\data\z\resource\help\vpn.h45" +;"\epoc32\data\z\resource\help\vpn.h49" +;"\epoc32\data\z\resource\help\vpn.h01" +;"\epoc32\data\z\resource\help\vpn.h51" +;"\epoc32\data\z\resource\help\vpn.h54" +;"\epoc32\data\z\resource\help\vpn.h57" +;"\epoc32\data\z\resource\help\vpn.h01" +;"\epoc32\data\z\resource\help\vpn.h59" +;"\epoc32\data\z\resource\help\vpn.h67" +;"\epoc32\data\z\resource\help\vpn.h68" +;"\epoc32\data\z\resource\help\vpn.h70" +;"\epoc32\data\z\resource\help\vpn.h76" +;"\epoc32\data\z\resource\help\vpn.h78" +;"\epoc32\data\z\resource\help\vpn.h79" +;"\epoc32\data\z\resource\help\vpn.h83" +;"\epoc32\data\z\resource\help\vpn.h93" +;"\epoc32\data\z\resource\help\vpn.h01" +;"\epoc32\data\z\resource\help\vpn.h01" +;}-"!:\resource\help\vpn.hlp" ; PKI Services Server "\epoc32\release\armv5\udeb\pkiservice.exe"-"!:\sys\bin\pkiservice.exe" @@ -426,13 +468,13 @@ "\epoc32\data\z\resource\vpnecomnotifier.r44" "\epoc32\data\z\resource\vpnecomnotifier.r102" "\epoc32\data\z\resource\vpnecomnotifier.r103" -"\epoc32\data\z\resource\vpnecomnotifier.r65" }-"!:\resource\vpnecomnotifier.rsc" ; XML Parser "\epoc32\release\armv5\udeb\utlxml.dll"-"!:\sys\bin\utlxml.dll" -; Install only languages that device supports +; During installation check languages that HW supports +; and install resources only for them. ; EN - 01 - English IF EXISTS ("z:\resource\avkon.r01") "\epoc32\data\z\resource\vpnecomnotifier.r01"-"!:\resource\vpnecomnotifier.r01" @@ -673,41 +715,49 @@ IF EXISTS ("z:\resource\avkon.r102") "\epoc32\data\z\resource\vpnecomnotifier.r102"-"!:\resource\vpnecomnotifier.r102" "\epoc32\data\z\resource\vpnmanagementuirsc.r102"-"!:\resource\vpnmanagementui.r102" +; Helps do not support language id 102 yet +;IF NOT EXISTS ("z:\resource\xhtml\102\0x10200EC4\index.xml") +;"\epoc32\data\Z\resource\xhtml\102\0x10200EC4\index.xml"-"!:\resource\xhtml\102\0x10200EC4\index.xml" +;"\epoc32\data\Z\resource\xhtml\102\0x10200EC4\keywords.xml"-"!:\resource\xhtml\102\0x10200EC4\keywords.xml" +;"\epoc32\data\Z\resource\xhtml\102\0x10200EC4\meta.xml"-"!:\resource\xhtml\102\0x10200EC4\meta.xml" +;"\epoc32\data\Z\resource\xhtml\102\0x10200EC4\contents.zip"-"!:\resource\xhtml\102\0x10200EC4\contents.zip" +;ENDIF ENDIF ; - 103 - Galicia IF EXISTS ("z:\resource\avkon.r103") "\epoc32\data\z\resource\vpnecomnotifier.r103"-"!:\resource\vpnecomnotifier.r103" "\epoc32\data\z\resource\vpnmanagementuirsc.r103"-"!:\resource\vpnmanagementui.r103" +; Helps do not support language 103 yet +;IF NOT EXISTS ("z:\resource\xhtml\103\0x10200EC4\index.xml") +;"\epoc32\data\Z\resource\xhtml\103\0x10200EC4\index.xml"-"!:\resource\xhtml\103\0x10200EC4\index.xml" +;"\epoc32\data\Z\resource\xhtml\103\0x10200EC4\keywords.xml"-"!:\resource\xhtml\103\0x10200EC4\keywords.xml" +;"\epoc32\data\Z\resource\xhtml\103\0x10200EC4\meta.xml"-"!:\resource\xhtml\103\0x10200EC4\meta.xml" +;"\epoc32\data\Z\resource\xhtml\103\0x10200EC4\contents.zip"-"!:\resource\xhtml\103\0x10200EC4\contents.zip" +;ENDIF ENDIF -; - 65 - Korean -IF EXISTS ("z:\resource\avkon.r65") -"\epoc32\data\z\resource\vpnecomnotifier.r65"-"!:\resource\vpnecomnotifier.r65" -"\epoc32\data\z\resource\vpnmanagementuirsc.r65"-"!:\resource\vpnmanagementui.r65" -ENDIF - "\epoc32\release\armv5\udeb\vpnpolicyrecognizer.dll"-"!:\sys\bin\vpnpolicyrecognizer.dll" "\epoc32\data\z\resource\plugins\vpnpolicyrecognizer.rsc"-"!:\resource\plugins\vpnpolicyrecognizer.rsc" "\epoc32\release\armv5\udeb\vpnpolins.exe"-"!:\sys\bin\vpnpolins.exe" "\epoc32\data\z\private\10003a3f\apps\vpnpolins_reg.rsc"-"!:\Private\10003a3f\import\apps\vpnpolins_reg.rsc" - ; Embedded VPN Policy Installer sis file @"mVPN_vpnpolins_armv5.sis",(0xA0000131) +; ; VPN Cleaner +; "\epoc32\release\armv5\udeb\vpncleaner.exe"-"!:\sys\bin\vpncleaner.exe",FR,RR,RW - +; ; The following modules must not be deleted before VPN Cleaner has been run: - ; VPN Manager "\epoc32\release\armv5\udeb\vpnmanager.exe"-"!:\sys\bin\vpnmanager.exe" - ; Event Mediator "\epoc32\release\armv5\udeb\eventmed.exe"-"!:\sys\bin\eventmed.exe" - +; "\epoc32\winscw\c\private\101FD288\backup_registration.xml"-"!:\Private\101FD288\backup_registration.xml" ; Event Mediator API "\epoc32\release\armv5\udeb\eventmedapi.dll"-"!:\sys\bin\eventmedapi.dll" ; VPN Installer +; "101f877b.txt"-"c:\Private\10202be9\persists\101f877b.txt" "\epoc32\release\armv5\udeb\vpnins.exe"-"!:\sys\bin\vpnins.exe",FR,RI,RW