# HG changeset patch
# User hgs
# Date 1272058359 -3600
# Node ID 947dd86c44e2f4b46d1773214fc5079c1ba17849
# Parent  5802e2ce68ed49235a9e42e7638e0ded8b556381
201015_15

diff -r 5802e2ce68ed -r 947dd86c44e2 kernel/eka/include/e32ver.h
--- a/kernel/eka/include/e32ver.h	Fri Apr 23 22:26:35 2010 +0100
+++ b/kernel/eka/include/e32ver.h	Fri Apr 23 22:32:39 2010 +0100
@@ -28,7 +28,7 @@
 
 const TInt KE32MajorVersionNumber=2;
 const TInt KE32MinorVersionNumber=0;
-const TInt KE32BuildVersionNumber=3068;
+const TInt KE32BuildVersionNumber=3069;
 
 const TInt KMachineConfigurationMajorVersionNumber=1;
 const TInt KMachineConfigurationMinorVersionNumber=0;
diff -r 5802e2ce68ed -r 947dd86c44e2 kernel/eka/release.txt
--- a/kernel/eka/release.txt	Fri Apr 23 22:26:35 2010 +0100
+++ b/kernel/eka/release.txt	Fri Apr 23 22:32:39 2010 +0100
@@ -1,3 +1,12 @@
+Version 2.00.3069
+=================
+(Made by vfebvre 20/04/2010)
+
+1.	vfebvre
+	1.	REQ417-62711 Sirocco: Build and Test Systems Migration
+		PackageReleaseID=487623 FeaturePlanID=457782
+
+
 Version 2.00.3068
 =================
 (Made by vfebvre 16/04/2010)
diff -r 5802e2ce68ed -r 947dd86c44e2 kernel/eka/rombuild/base.iby
--- a/kernel/eka/rombuild/base.iby	Fri Apr 23 22:26:35 2010 +0100
+++ b/kernel/eka/rombuild/base.iby	Fri Apr 23 22:32:39 2010 +0100
@@ -161,7 +161,7 @@
 file=ABI_DIR\DEBUG_DIR\usbhostmsclient.dll  sys\bin\usbhostmsclient.dll
 file=ABI_DIR\DEBUG_DIR\usbhostmssrv.exe     sys\bin\usbhostmssrv.exe
 #endif
-#endif //#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && defined(SYMBIAN_INCLUDE_USB_OTG_HOST) && !defined(SYMBIAN_EXCLUDE_USB)
+#endif //#if defined(SYMBIAN_ENABLE_USB_OTG_HOST) && defined(SYMBIAN_INCLUDE_USB_OTG_HOST) && defined(__USB)
 
 #if defined(_NAND) || defined(_NAND2) || defined(_ONENAND) || defined (WITH_INTERNAL_MMC)
 #if !defined PAGED_ROM || defined EFFICIENT_ROM_PAGING || defined CODE_PAGING_FROM_ROFS
diff -r 5802e2ce68ed -r 947dd86c44e2 userlibandfileserver/fileserver/group/release.txt
--- a/userlibandfileserver/fileserver/group/release.txt	Fri Apr 23 22:26:35 2010 +0100
+++ b/userlibandfileserver/fileserver/group/release.txt	Fri Apr 23 22:32:39 2010 +0100
@@ -1,3 +1,12 @@
+Version 2.00.3034
+=================
+(Made by vfebvre 20/04/2010)
+
+1.	vfebvre
+	1.	REQ417-62711 Sirocco: Build and Test Systems Migration
+		PackageReleaseID=487623 FeaturePlanID=457782
+
+
 Version 2.00.3033
 =================
 (Made by vfebvre 16/04/2010)
diff -r 5802e2ce68ed -r 947dd86c44e2 userlibandfileserver/fileserver/inc/f32ver.h
--- a/userlibandfileserver/fileserver/inc/f32ver.h	Fri Apr 23 22:26:35 2010 +0100
+++ b/userlibandfileserver/fileserver/inc/f32ver.h	Fri Apr 23 22:32:39 2010 +0100
@@ -58,6 +58,6 @@
 
 @see TVersion
 */
-const TInt KF32BuildVersionNumber=3033;
+const TInt KF32BuildVersionNumber=3034;
 //
 #endif
diff -r 5802e2ce68ed -r 947dd86c44e2 userlibandfileserver/fileserver/rom/f32.iby
--- a/userlibandfileserver/fileserver/rom/f32.iby	Fri Apr 23 22:26:35 2010 +0100
+++ b/userlibandfileserver/fileserver/rom/f32.iby	Fri Apr 23 22:32:39 2010 +0100
@@ -80,7 +80,7 @@
 file=\Epoc32\Release\##SMAIN##\##BUILD##\erofs.fsy  sys\bin\erofs.fsy
 #endif
 
-#ifdef SYMBIAN_EXCLUDE_USB
+#ifndef __USB
 REM Feature USB is not included in this ROM
 #else
 #ifdef WITH_MASS_STORAGE
@@ -95,4 +95,4 @@
 file=\epoc32\release\##MAIN##\##BUILD##\usbhostmssrv.exe    sys\bin\usbhostmssrv.exe
 #endif //SYMBIAN_INCLUDE_USB_OTG_HOST
 #endif //WITH_MASS_STORAGE
-#endif //SYMBIAN_EXCLUDE_USB
+#endif //__USB