# HG changeset patch
# User hgs
# Date 1279810100 -19800
# Node ID 465613364af062d5c49628cae08c530461eb9941
# Parent  1efb81185f1cc7af12e8d5ae60a8644ae071bed5
201029_01

diff -r 1efb81185f1c -r 465613364af0 contentmgmt/cafrecogniserconfig/ReccafConfig.iby
--- a/contentmgmt/cafrecogniserconfig/ReccafConfig.iby	Thu Jul 22 18:30:16 2010 +0530
+++ b/contentmgmt/cafrecogniserconfig/ReccafConfig.iby	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -19,6 +19,6 @@
 #define __RECCAFCONFIG_IBY__
 
 // Store file in Apparc Server Private Directory
-data=ZPRIVATE\10003A3F\RecCaf\RecCafMimeTypes.txt 	\private\10003a3f\RecCaf\RecCafMimeTypes.txt
+data=ZPRIVATE\10003a3f\reccaf\reccafmimetypes.txt 	\private\10003a3f\reccaf\reccafmimetypes.txt
 
 #endif
diff -r 1efb81185f1c -r 465613364af0 cryptomgmtlibs/securityutils/group/bld.inf
--- a/cryptomgmtlibs/securityutils/group/bld.inf	Thu Jul 22 18:30:16 2010 +0530
+++ b/cryptomgmtlibs/securityutils/group/bld.inf	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -34,7 +34,7 @@
 // ROMKIT includes
 ../inc/secutil.iby 	/epoc32/rom/include/secutil.iby
 ../inc/sectcbutil.iby	/epoc32/rom/include/sectcbutil.iby
-../inc/SecSettings.iby			/epoc32/rom/include/SecSettings.iby
+../inc/secsettings.iby			/epoc32/rom/include/secsettings.iby
 
 
 PRJ_TESTEXPORTS
diff -r 1efb81185f1c -r 465613364af0 cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby
--- a/cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby	Thu Jul 22 18:30:16 2010 +0530
+++ b/cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -30,7 +30,7 @@
 
 #ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
 file=ABI_DIR\BUILD_DIR\fstokenserver_useauth.exe		sys\bin\fstokenserver.exe
-data=\epoc32\data\z\private\10202BE9\200218e6.txt   \private\10202be9\200218e6.txt
+data=EPOCROOT##epoc32\data\z\private\10202be9\200218e6.txt   \private\10202be9\200218e6.txt
 
 #else
 file=ABI_DIR\BUILD_DIR\fstokenserver.exe				sys\bin\fstokenserver.exe
diff -r 1efb81185f1c -r 465613364af0 securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby
--- a/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby	Thu Jul 22 18:30:16 2010 +0530
+++ b/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -19,7 +19,7 @@
 #ifndef __OCSPCENREP_IBY__
 #define __OCSPCENREP_IBY__
 
-data=ZPRIVATE\10202BE9\2002b28b.txt private\10202be9\2002b28b.txt
+data=ZPRIVATE\10202be9\2002b28b.txt private\10202be9\2002b28b.txt
 
 #endif // __OCSPCENREP_IBY__
 
diff -r 1efb81185f1c -r 465613364af0 securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby
--- a/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby	Thu Jul 22 18:30:16 2010 +0530
+++ b/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -22,6 +22,6 @@
 
 data=ZRESOURCE\tlsproviderpolicy.ini 	\Resource\tlsproviderpolicy.ini
 data=MULTI_LINGUIFY(RSC ZRESOURCE\swtlstokentype resource\swtlstokentype)
-data=MULTI_LINGUIFY(RSC ZRESOURCE\TlsCacheServer\TlsCacheTimeouts resource\TlsCacheServer\TlsCacheTimeouts)
+data=MULTI_LINGUIFY(RSC ZRESOURCE\tlscacheserver\tlscachetimeouts resource\tlscacheserver\tlscachetimeouts)
 
 #endif
diff -r 1efb81185f1c -r 465613364af0 securityanddataprivacytools/securityconfig/ups/ups_config.iby
--- a/securityanddataprivacytools/securityconfig/ups/ups_config.iby	Thu Jul 22 18:30:16 2010 +0530
+++ b/securityanddataprivacytools/securityconfig/ups/ups_config.iby	Thu Jul 22 20:18:20 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -19,10 +19,10 @@
 
 #ifndef __UPS_CONFIG_IBY__
 #define __UPS_CONFIG_IBY__
-define ZDRIVE EPOCROOT##epoc32\data\Z
+define ZDRIVE EPOCROOT##epoc32\data\z
 
 data=ZDRIVE\system\install\upsserver.sis 		system\install\upsserver.sis
-data=ZDRIVE\Private\10283558\backup_registration.xml	private\10283558\backup_registration.xml
+data=ZDRIVE\private\10283558\backup_registration.xml	private\10283558\backup_registration.xml
 
 #endif