# HG changeset patch
# User mikek
# Date 1273736298 -3600
# Node ID 787612182dd09640362d0f009319fe9b80c48501
# Parent  301c3edbdaa1a9293599a1788c15cfb3a5ca818c
1) Make cross-plat-dev-utils perl scripts independent of the package directory name
2) Fix c++ code to get rid of const_casts

diff -r 301c3edbdaa1 -r 787612182dd0 .hgignore
--- a/.hgignore	Wed May 12 09:52:26 2010 +0100
+++ b/.hgignore	Thu May 13 08:38:18 2010 +0100
@@ -1,4 +1,6 @@
 syntax: glob
 *~
 *.o
+*.so
+*.pyc
 
diff -r 301c3edbdaa1 -r 787612182dd0 bintools/checklib/library/library.cpp
--- a/bintools/checklib/library/library.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/bintools/checklib/library/library.cpp	Thu May 13 08:38:18 2010 +0100
@@ -53,7 +53,7 @@
     m_mem_p = new char[size];
 
     file.seekg(0, std::ios::beg);
-    file.read( const_cast<char*>(m_mem_p), size );
+	file.read(m_mem_p, size );
 
     file.close();
 
diff -r 301c3edbdaa1 -r 787612182dd0 bintools/checklib/library/library.h
--- a/bintools/checklib/library/library.h	Wed May 12 09:52:26 2010 +0100
+++ b/bintools/checklib/library/library.h	Thu May 13 08:38:18 2010 +0100
@@ -39,11 +39,12 @@
     const char* _eat_obj_header(const char*, const char*, unsigned long*, const char* = 0) const;
 
 private:
-    const char* m_mem_p;
+	char * m_mem_p;
 
     const char* m_first_p;
     const char* m_last_p;
 
+
     mutable std::vector<const char*> m_symbols;
     mutable std::vector< std::pair<const char*, const char*> > m_objects;
 };
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/apply_patch_file.pm
--- a/cross-plat-dev-utils/apply_patch_file.pm	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/apply_patch_file.pm	Thu May 13 08:38:18 2010 +0100
@@ -21,7 +21,7 @@
 use strict;
 use File::Spec;
 use File::Copy;
-use set_epocroot;
+use places;
 use check_os;
 
 sub compare_files($$)
@@ -43,13 +43,12 @@
 {
     my $patch_file = shift;
     my ($src_file, $dest_file);
-    set_epocroot();
-    my $epocroot = $ENV{'EPOCROOT'};
+    my $epocroot = get_epocroot();
     my $patch_files_dir;
 	if (os_is_windows()) {
-		$patch_files_dir = File::Spec->catfile("$epocroot","build","cross-plat-dev-utils","patch-files","windows");
+		$patch_files_dir = File::Spec->catfile(get_pkg_dir(),"cross-plat-dev-utils","patch-files","windows");
 	} elsif (os_is_linux()) {
-		$patch_files_dir = File::Spec->catfile("$epocroot","build","cross-plat-dev-utils","patch-files","linux");
+		$patch_files_dir = File::Spec->catfile(get_pkg_dir(),"cross-plat-dev-utils","patch-files","linux");
 	} else {
 		die "*** Unsupported OS $^O ***";
 	} 
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/build_all.pl
--- a/cross-plat-dev-utils/build_all.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/build_all.pl	Thu May 13 08:38:18 2010 +0100
@@ -13,7 +13,7 @@
 
 use strict;
 use perl_run;
-use set_epocroot;
+use places;
 use check_os;
 my $keepgoing = 0;
 my @built = ();
@@ -27,7 +27,7 @@
 	print ">>> Building target $targ\n";
 	my $rc = perl_run("build_target.pl $targ");
 	if ($rc) {
-		print "*** Failed to build target $targ ***";
+		print "*** Failed to build target $targ ***\n";
 		if ($keepgoing) {
 			push(@failed,$targ);
 		} else {
@@ -58,8 +58,7 @@
         exit 1;
     }         
 }
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
+my $epocroot = get_epocroot();
 my @targ_lines = perl_slurp("list_targets.pl");
 open DEPS,"<deps.txt" or die $!;
 my @deps = <DEPS>;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/build_raptor.pl
--- a/cross-plat-dev-utils/build_raptor.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/build_raptor.pl	Thu May 13 08:38:18 2010 +0100
@@ -12,7 +12,7 @@
 
 use strict;
 use File::Spec;
-use set_epocroot;
+use places;
 
 if (@ARGV) {
     if (grep(/$ARGV[0]/,("-h","--help"))) {
@@ -25,9 +25,8 @@
         exit 1;
     }
 }
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $sbs_home = File::Spec->catfile("$epocroot","build","sbsv2","raptor");
+my $epocroot = get_epocroot();
+my $sbs_home = File::Spec->catfile(get_pkg_dir(),"sbsv2","raptor");
 $ENV{'SBS_HOME'} = $sbs_home;
 my $cmd = "make -C $sbs_home/util @ARGV";
 print "Executing: $cmd\n";
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/build_target.pl
--- a/cross-plat-dev-utils/build_target.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/build_target.pl	Thu May 13 08:38:18 2010 +0100
@@ -15,7 +15,7 @@
 # $@ is shifted to get optional additional arguments to the sbs command
 
 use strict;
-use set_epocroot;
+use places;
 use File::Spec;
 use Cwd; 
 
@@ -30,15 +30,10 @@
         exit 0;
     }         
 }
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $sbs_home = $ENV{'SBS_HOME'};
-unless($sbs_home) {
-    $sbs_home = File::Spec->catfile("$epocroot","build","sbsv2","raptor");
-    $ENV{'SBS_HOME'} = $sbs_home;
-}
+my $epocroot = get_epocroot();
+my $sbs_home = get_sbs_home();
 my $build_dir = shift;
-$build_dir = File::Spec->catfile("$epocroot","build","$build_dir");
+$build_dir = File::Spec->catfile(get_pkg_dir(),"$build_dir");
 if (! -d $build_dir) {
     die "*** Error: \"$build_dir\" not found ***\n";
 }
@@ -57,9 +52,9 @@
 if (! -f $bld_inf) {
 	die "*** Error: No bld.inf in \"$build_dir\" ***";
 }
-my $log_stem = File::Spec->catfile("$epocroot","epoc32","build","Makefile");
+my $log_stem = File::Spec->catfile(get_epoc32_dir(),"build","Makefile");
 my $log_pattern = "$log_stem\.\*\.log"; 
-my $raptor = File::Spec->catfile("$sbs_home","bin","sbs");
+my $raptor = File::Spec->catfile(get_sbs_home(),"bin","sbs");
 my $cmd = "$raptor -c tools2 -b $bld_inf @ARGV";
 print ">>> Executing: $cmd\n";
 my $rc = system($cmd) >> 8;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/clean_build_logs.pl
--- a/cross-plat-dev-utils/clean_build_logs.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/clean_build_logs.pl	Thu May 13 08:38:18 2010 +0100
@@ -13,14 +13,13 @@
 
 use strict;
 use usage;
-use set_epocroot;
+use places;
 use File::Spec;
 use Cwd; 
 
 usage(\@ARGV,"This script deletes all Raptor build logs");
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $log_stem = File::Spec->catfile("$epocroot","epoc32","build","Makefile");
+my $epocroot = get_epocroot();
+my $log_stem = File::Spec->catfile(get_epoc32_dir(),"build","Makefile");
 my $log_pattern = "$log_stem\.\*\.log"; 
 my @old_logs = glob($log_pattern);
 if (@old_logs) {
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/deepclean_raptor.pl
--- a/cross-plat-dev-utils/deepclean_raptor.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/deepclean_raptor.pl	Thu May 13 08:38:18 2010 +0100
@@ -15,7 +15,7 @@
 use perl_run;
 use File::Spec;
 use File::Path 'remove_tree';
-use set_epocroot;
+use places;
 
 usage(\@ARGV,"This script removes all files created by building Raptor");
 my $any_old_targ = File::Spec->catfile("buildtoolguides","romtoolsguide");
@@ -23,9 +23,8 @@
 $build_log =~ /<info>Environment HOSTPLATFORM_DIR=(\S*)<\/info>/;
 my $host_platform_dir = $1;
 die "*** Error: Can't determine HOSTPLATFORM_DIR ***", unless ($host_platform_dir);
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $abs_host_platform_dir = File::Spec->catfile("$epocroot","build","sbsv2","raptor","$host_platform_dir");
+my $epocroot = get_epocroot();
+my $abs_host_platform_dir = File::Spec->catfile(get_sbs_home(),"$host_platform_dir");
 if (-d $abs_host_platform_dir) {
 	print ">>> Clean Raptor\n";
 	perl_run("clean_raptor.pl") and die $!;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/diff_upstream.pl
--- a/cross-plat-dev-utils/diff_upstream.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/diff_upstream.pl	Thu May 13 08:38:18 2010 +0100
@@ -14,7 +14,7 @@
 use strict;
 use get_baseline;
 use perl_run;
-use set_epocroot;
+use places;
 use get_hostplatform_dir;
 use File::Spec;
 use Cwd 'abs_path';
@@ -42,13 +42,12 @@
 my $diff_test = "diff --version";
 my $devnull = File::Spec->devnull();
 print ">>> Executing: $diff_test\n";
-my $rc = system($diff_test > $devnull);
-die "*** Error: can't execute the diff tool ***", if ($rc);
+my $rc = system("$diff_test > $devnull") >> 8;
+die "*** Error: can't execute the diff tool: $rc ***", if ($rc);
 $baseline_dir = abs_path($baseline_dir);
 perl_run("get_upstream.pl $baseline_dir") and die $!;
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $build_pkg_dir = File::Spec->catfile("$epocroot","build");
+my $epocroot = get_epocroot();
+my $build_pkg_dir = get_pkg_dir();
 $baseline_dir = File::Spec->catfile("$baseline_dir","build");
 my $host_platform_dir = get_hostplatform_dir();
 push(@excludes,"*$host_platform_dir*");
@@ -58,7 +57,7 @@
 my $diff_cmd;
 if (!$diff_out) {
 	my $baseline_rev = get_baseline();
-	$diff_out = File::Spec->catfile("$epocroot","build","cross-plat-dev-utils",
+	$diff_out = File::Spec->catfile("$build_pkg_dir","cross-plat-dev-utils",
 		"patch-files","diffs","patch-$baseline_rev.patch");
 }
 open DIFF,">$diff_out" or die $!;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/fix_epoc32_linux.pl
--- a/cross-plat-dev-utils/fix_epoc32_linux.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/fix_epoc32_linux.pl	Thu May 13 08:38:18 2010 +0100
@@ -24,16 +24,15 @@
 require_os_linux();
 
 usage(\@ARGV,"This script makes required fixes to epoc32 tree in Linux");
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $wrong_product_variant_hrh = File::Spec->catfile("$epocroot","epoc32","include","ProductVariant.hrh");
-my $right_product_variant_hrh = File::Spec->catfile("$epocroot","epoc32","include","productvariant.hrh");
+my $epocroot = get_epocroot();
+my $wrong_product_variant_hrh = File::Spec->catfile(get_epoc32_dir(),"include","ProductVariant.hrh");
+my $right_product_variant_hrh = File::Spec->catfile(get_epoc32_dir(),"include","productvariant.hrh");
 if (! -f $right_product_variant_hrh and ! -l $right_product_variant_hrh) {
 	print ">>> Creating symlink \"$wrong_product_variant_hrh\" -> \"$right_product_variant_hrh\"\n";
 	print ">>> (workaround for bug #1399)\n";
 	symlink($wrong_product_variant_hrh,$right_product_variant_hrh) or die $!;
 }
-my $gcc_include_dir = File::Spec->catfile("$epocroot","epoc32","include","gcc");
+my $gcc_include_dir = File::Spec->catfile(get_epoc32_dir(),"include","gcc");
 if (! -d $gcc_include_dir) {
 	print ">>> Creating \"$gcc_include_dir\"\n";
 	mkdir $gcc_include_dir or die $!;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/fix_epoc32_win.pl
--- a/cross-plat-dev-utils/fix_epoc32_win.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/fix_epoc32_win.pl	Thu May 13 08:38:18 2010 +0100
@@ -19,9 +19,8 @@
 
 require_os_windows();
 usage(\@ARGV,"This script makes required fixes to epoc32 tree in Windows");
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $gcc_mingw_include_dir = File::Spec->catfile("$epocroot","epoc32","include","gcc_mingw");
+my $epocroot = get_epocroot();
+my $gcc_mingw_include_dir = File::Spec->catfile(get_epoc32_dir(),"include","gcc_mingw");
 
 if (! -d $gcc_mingw_include_dir) { 
 	print ">>> Creating \"$gcc_mingw_include_dir\"\n";
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/fix_raptor_config_linux.pl
--- a/cross-plat-dev-utils/fix_raptor_config_linux.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/fix_raptor_config_linux.pl	Thu May 13 08:38:18 2010 +0100
@@ -17,11 +17,16 @@
 use File::Spec;
 use apply_patch_file;
 use usage;
+use places;
 use check_os;
 
 require_os_linux();
 usage(\@ARGV,"This script makes required fixes to Raptor configuration for Linux");
-my $gcc_config_file = File::Spec->catfile("build","sbsv2","raptor","lib","config","gcc.xml");
+my $pkg_dir = get_pkg_dir();
+my ($vol,$dirs,$file) = File::Spec->splitpath($pkg_dir,1);
+my @dirs = File::Spec->splitdir($dirs);
+my $pkg_dir_leaf = pop(@dirs); 
+my $gcc_config_file = File::Spec->catfile("$pkg_dir_leaf","sbsv2","raptor","lib","config","gcc.xml");
 apply_patch_file($gcc_config_file);
 exit 0;
 
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/get_baseline.pm
--- a/cross-plat-dev-utils/get_baseline.pm	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/get_baseline.pm	Thu May 13 08:38:18 2010 +0100
@@ -13,7 +13,7 @@
 
 use strict;
 use File::Spec;
-use set_epocroot;
+use places;
 
 sub trim($)
 {
@@ -25,9 +25,8 @@
 
 sub get_baseline()
 {
-	set_epocroot();
-	my $epocroot = $ENV{'EPOCROOT'};
-	my $baseline_txt = File::Spec->catfile("$epocroot","build","baseline.txt");
+	my $epocroot = get_epocroot();
+	my $baseline_txt = File::Spec->catfile(get_pkg_dir(),"baseline.txt");
 	open IN,"<$baseline_txt" or die $!;
 	my @lines = <IN>;
 	close IN;
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/list_targets.pl
--- a/cross-plat-dev-utils/list_targets.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/list_targets.pl	Thu May 13 08:38:18 2010 +0100
@@ -12,7 +12,7 @@
 # Lists all directories that contain a BLD.INF or bld.inf file.
 
 use strict;
-use set_epocroot;
+use places;
 use usage;
 use File::Spec;
 sub list_targets($);
@@ -21,10 +21,8 @@
 usage(\@ARGV,"This script lists the available Raptor targets in the build package",
 		"Lists all directories that contain a BLD.INF or bld.inf file");
 
-
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $build_pkg_dir = File::Spec->catfile("$epocroot","build");
+my $epocroot = get_epocroot();
+my $build_pkg_dir = get_pkg_dir();
 my $build_pkg_dir_parts = File::Spec->splitdir($build_pkg_dir);
   
 list_targets($build_pkg_dir);
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch
--- a/cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch	Thu May 13 08:38:18 2010 +0100
@@ -1,7 +1,7 @@
 ## diff generated by diff_upstream.pl
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/library/library.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp	2010-05-10 19:22:09.012618252 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/library/library.cpp	2010-05-08 15:37:06.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp	2010-05-08 15:37:06.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <iostream>
  #include <iomanip>
@@ -10,9 +10,9 @@
  
  namespace
  {
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/main.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp	2010-05-10 19:22:09.012618252 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/main.cpp	2010-05-08 15:36:26.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp	2010-05-08 15:36:26.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <sstream>
  #include <iostream>
@@ -21,9 +21,9 @@
  
  
  const char SELF_NAME[] = "checklib";
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/coff_object.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp	2010-05-10 19:22:09.012618252 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/coff_object.cpp	2010-05-08 15:38:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp	2010-05-08 15:38:08.000000000 +0100
 @@ -21,6 +21,7 @@
  
  #include <algorithm>
@@ -32,9 +32,9 @@
  
  Coff_object::Coff_object(const char* p1, const char* p2)
  {
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/elf_object.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp	2010-05-10 19:22:09.016622392 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/elf_object.cpp	2010-05-08 15:37:34.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp	2010-05-08 15:37:34.000000000 +0100
 @@ -22,6 +22,7 @@
  
  #include <algorithm>
@@ -43,9 +43,9 @@
  
  Elf_object::Elf_object(const char* p1, const char* p2)
  {
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/localise.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp	2010-05-10 19:22:09.052619146 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/localise.cpp	2010-05-08 15:38:52.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp	2010-05-08 15:38:52.000000000 +0100
 @@ -27,9 +27,11 @@
  #pragma warning( disable : 4530 )	// function not inlined.
  #endif
@@ -76,9 +76,9 @@
  	ofstream outputFile(LocalisationOutputFileName);
  
  	String fileLine("");
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcomp.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp	2010-05-10 19:22:09.056620563 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcomp.cpp	2010-05-08 15:41:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp	2010-05-08 15:41:18.000000000 +0100
 @@ -90,8 +90,8 @@
  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data
  #endif //__VC32__
@@ -113,9 +113,9 @@
  #include "localise.h"
  #include "main.h"
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcompl.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp	2010-05-10 19:22:09.056620563 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcompl.cpp	2010-05-08 15:40:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp	2010-05-08 15:40:00.000000000 +0100
 @@ -662,8 +662,8 @@
  #include <limits.h>
  #include <string.h>
@@ -145,9 +145,9 @@
  
  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.LEX
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX	2010-05-10 19:22:09.048617870 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.LEX	2010-05-08 15:45:48.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX	2010-05-08 15:45:48.000000000 +0100
 @@ -20,9 +20,9 @@
  #include <limits.h>
  #include <string.h>
@@ -170,9 +170,9 @@
  
  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.YACC
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC	2010-05-10 19:22:09.048617870 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.YACC	2010-05-08 15:47:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC	2010-05-08 15:47:00.000000000 +0100
 @@ -35,8 +35,8 @@
  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data
  #endif //__VC32__
@@ -207,27 +207,28 @@
  #include "localise.h"
  #include "main.h"
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/romtoolsguide/group/bld.inf
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf	2010-05-10 19:22:12.052626200 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/romtoolsguide/group/bld.inf	2010-05-08 15:41:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf	2010-05-08 15:41:44.000000000 +0100
 @@ -1,3 +1,3 @@
  
  PRJ_EXPORTS
 -../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar
 \ No newline at end of file
 +../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar 
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/sbsv2guide/group/bld.inf
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf	2010-05-10 19:22:12.056620772 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/sbsv2guide/group/bld.inf	2010-05-08 15:42:04.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf	2010-05-08 15:42:04.000000000 +0100
 @@ -1,3 +1,3 @@
  
  PRJ_EXPORTS
 -../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar
 \ No newline at end of file
 +../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/e32image/deflate/deflate.cpp
+Only in /home/imk/symbian/epocroot-pdk-3.0.h/linux_build: deleteme.txt
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-10 19:22:12.064620322 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-08 14:35:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp	2010-05-08 14:35:02.000000000 +0100
 @@ -87,7 +87,7 @@
  
  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
@@ -238,9 +239,9 @@
  
  inline TInt HDeflateHash::Hash(const TUint8* aPtr)
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image: Makefile.elftran.bak
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/group/seclib.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp	2010-05-10 19:22:12.068618177 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/group/seclib.mmp	2010-05-08 14:34:04.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp	2010-05-08 14:34:04.000000000 +0100
 @@ -45,8 +45,11 @@
  userinclude     ../setcap 
  userinclude     ../../e32lib/e32image/inc
@@ -253,9 +254,9 @@
  
  //macro __PLACEMENT_NEW_INLINE
  //macro __PLACEMENT_VEC_NEW_INLINE
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/group/elf2e32.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-10 19:22:12.072624202 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-08 14:17:32.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp	2010-05-08 14:17:32.000000000 +0100
 @@ -28,7 +28,9 @@
  source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp
  
@@ -266,9 +267,9 @@
  
  option 	GCC -w
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deffile.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp	2010-05-10 19:22:12.072624202 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deffile.cpp	2010-05-08 14:31:46.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp	2010-05-08 14:31:46.000000000 +0100
 @@ -18,9 +18,11 @@
  //
  
@@ -283,9 +284,9 @@
  
  #include "pl_symbol.h"
  #include "deffile.h"
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deflatecompress.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-10 19:22:12.072624202 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-08 14:25:12.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp	2010-05-08 14:25:12.000000000 +0100
 @@ -126,7 +126,8 @@
  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
  {
@@ -296,9 +297,9 @@
  }
  
  /**
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32exporttable.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-10 19:22:12.076640076 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-08 14:18:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp	2010-05-08 14:18:16.000000000 +0100
 @@ -18,6 +18,7 @@
  #include "pl_elfexports.h"
  #include "pl_dllsymbol.h"
@@ -307,9 +308,9 @@
  
  /**
  Destructor for E32ExportTable class.
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32imagefile.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-10 19:22:12.076640076 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-08 14:20:20.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp	2010-05-08 14:20:20.000000000 +0100
 @@ -21,6 +21,7 @@
  
  // get E32ImageHeader class...
@@ -366,9 +367,9 @@
  
  	// At the end, the dependencies are listed. They remain zeroes and shall be fixed up
  	// while relocating.
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/elffilesupplied.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-10 19:22:12.076640076 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-08 14:22:14.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp	2010-05-08 14:22:14.000000000 +0100
 @@ -25,7 +25,15 @@
  
  #include <algorithm>
@@ -404,9 +405,9 @@
      = aSymbolSet.find(aSymbol);
    if(it != aSymbolSet.end())
  	return 1;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/errorhandler.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-10 19:22:12.076640076 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-08 14:24:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp	2010-05-08 14:24:02.000000000 +0100
 @@ -26,7 +26,9 @@
  #include "errorhandler.h"
  #include "messagehandler.h"
@@ -418,9 +419,9 @@
  using std::cerr;
  using std::endl;
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/huffman.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp	2010-05-10 19:22:12.085117410 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/huffman.cpp	2010-05-08 14:25:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp	2010-05-08 14:25:08.000000000 +0100
 @@ -22,6 +22,7 @@
  #endif
  
@@ -429,9 +430,9 @@
  #include "huffman.h"
  #include "errorhandler.h"
  #include "farray.h"
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/h_utl.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp	2010-05-10 19:22:12.085117410 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/h_utl.cpp	2010-05-08 14:33:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp	2010-05-08 14:33:02.000000000 +0100
 @@ -17,8 +17,9 @@
  // 
  //
@@ -445,9 +446,9 @@
  
  /**
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source: h_utl.h.bak
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/inflate.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp	2010-05-10 19:22:12.085117410 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/inflate.cpp	2010-05-08 14:25:46.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp	2010-05-08 14:25:46.000000000 +0100
 @@ -23,6 +23,8 @@
  #include "farray.h"
  #include "errorhandler.h"
@@ -457,9 +458,9 @@
  using std::cout;
  
  /*
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/messageimplementation.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-10 19:22:12.089117220 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-08 14:33:34.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp	2010-05-08 14:33:34.000000000 +0100
 @@ -23,7 +23,8 @@
  #include<iostream>
  #include<stdarg.h>
@@ -470,9 +471,9 @@
  
  using std::endl;
  using std::cout;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/parametermanager.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-10 19:22:12.089117220 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-08 14:29:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp	2010-05-08 14:29:50.000000000 +0100
 @@ -2247,7 +2247,7 @@
  		{
  			int len = nq;
@@ -491,9 +492,9 @@
  
  		b = e;
  		
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexecutable.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-10 19:22:12.093117728 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-08 14:31:06.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h	2010-05-08 14:31:06.000000000 +0100
 @@ -22,13 +22,19 @@
  
  #include "pl_common.h"
@@ -525,9 +526,9 @@
  
  	/**
  	 * The static symbol table.
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexports.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-10 19:22:12.093117728 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-08 14:20:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp	2010-05-08 14:20:44.000000000 +0100
 @@ -20,6 +20,7 @@
  #include "pl_elfexports.h"
  #include "pl_elfexecutable.h"
@@ -536,9 +537,9 @@
  
  using std::set_difference;
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfimports.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-10 19:22:12.093117728 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-08 14:32:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp	2010-05-08 14:32:18.000000000 +0100
 @@ -19,6 +19,7 @@
  
  #include "pl_elfimports.h"
@@ -547,9 +548,9 @@
  
  /**
  Constructor for class ElfImports
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfproducer.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-10 19:22:12.097117747 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-08 14:23:30.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp	2010-05-08 14:23:30.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <stdio.h>
  #include <string>
@@ -558,9 +559,9 @@
  
  /**
   * Following array is indexed on the SECTION_INDEX enum 
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_symbol.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-10 19:22:12.097117747 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-08 14:18:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp	2010-05-08 14:18:40.000000000 +0100
 @@ -18,6 +18,7 @@
  //
  
@@ -573,9 +574,9 @@
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featuredatabase.dtd.bak
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featureuids.dtd.bak
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: imageContent.dtd.bak
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/bld.inf
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf	2010-05-10 19:22:12.133117501 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/bld.inf	2010-05-08 15:25:20.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf	2010-05-08 15:25:20.000000000 +0100
 @@ -21,8 +21,10 @@
  
  // These libraries needs to be exported
@@ -587,9 +588,9 @@
  ../src/imgcheck.xsl			/epoc32/tools/imgcheck.xsl
  ./imgcheck.pl				/epoc32/tools/imgcheck.pl
  ./imgcheck.cmd				/epoc32/tools/imgcheck.cmd
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/imgcheck.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-10 19:22:12.133117501 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-08 17:31:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp	2010-05-08 17:31:00.000000000 +0100
 @@ -25,17 +25,24 @@
  SOURCE		exceptionimplementation.cpp exceptionreporter.cpp
  SOURCE 		cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp
@@ -618,9 +619,9 @@
  #else
  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
  OPTION    GCC -mthreads -O2 -Wno-uninitialized
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/cmdlinehandler.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-10 19:22:13.089118113 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-08 15:31:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h	2010-05-08 15:31:40.000000000 +0100
 @@ -120,7 +120,7 @@
  @internalComponent
  @released
@@ -639,9 +640,9 @@
  {
      ENone = 0x0,
      ESingle = 0x1,
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/common.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h	2010-05-10 19:22:13.089118113 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/common.h	2010-05-08 15:30:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h	2010-05-08 15:30:02.000000000 +0100
 @@ -86,7 +86,7 @@
  @internalComponent
  @released
@@ -651,9 +652,9 @@
  {
  	ESuccess = 0,
  	EQuit,
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/exceptionimplementation.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-10 19:22:13.089118113 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-08 15:30:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h	2010-05-08 15:30:50.000000000 +0100
 @@ -91,7 +91,7 @@
  struct Messages
  {
@@ -672,9 +673,9 @@
  	IndexVsMessageMap iMessage;
  	unsigned int iMsgIndex;
  	static unsigned int iCmdFlag;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/xmlwriter.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-10 19:22:13.093117295 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-08 15:32:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h	2010-05-08 15:32:40.000000000 +0100
 @@ -24,7 +24,12 @@
  #define XMLWRITER_H
  
@@ -698,9 +699,9 @@
  	// Xml file name for output.
  	const String iXmlFileName;
  	// Xml Buffer pointer.
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/inc/typedefs.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-10 19:22:13.093117295 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-08 15:36:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h	2010-05-08 15:36:00.000000000 +0100
 @@ -28,8 +28,8 @@
  
  #undef _L
@@ -735,9 +736,9 @@
  {
  	EUnknownImage,
  	ERomImage,
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-10 19:22:13.097117523 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-08 15:34:42.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp	2010-05-08 15:34:42.000000000 +0100
 @@ -119,9 +119,9 @@
  void DirReader::ProcessImage()
  {
@@ -762,9 +763,9 @@
  	E32Image* e32Image = KNull;
  
  #ifdef __LINUX__
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/romreader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/romreader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp	2010-05-10 19:22:13.097117523 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/romreader.cpp	2010-05-08 15:33:14.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/romreader.cpp	2010-05-08 15:33:14.000000000 +0100
 @@ -53,7 +53,7 @@
  RomReader::RomReader(const char* aFile, EImageType aImgType) 
  : ImageReader(aFile), iImageHeader(0), iData(0), iImgType(aImgType)
@@ -774,9 +775,9 @@
  }
  
  /** 
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinehandler.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-10 19:22:13.137118346 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-08 15:21:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp	2010-05-08 15:21:44.000000000 +0100
 @@ -25,6 +25,7 @@
  */
  
@@ -785,9 +786,9 @@
  
  /**
  Constructor initializes the iOptionMap with short and long option names as key and
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinewriter.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-10 19:22:13.137118346 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-08 15:22:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp	2010-05-08 15:22:18.000000000 +0100
 @@ -24,6 +24,7 @@
  */
  
@@ -796,9 +797,9 @@
  
  /**
  Constructor: CmdLineWriter class
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/exceptionimplementation.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-10 19:22:13.137118346 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-08 15:24:58.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp	2010-05-08 15:24:58.000000000 +0100
 @@ -187,7 +187,7 @@
      
  	if(iCmdFlag & KVerbose)
@@ -821,9 +822,9 @@
 +		std::cerr << aMsg.c_str() << std::endl;
  	}
  }
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/sidchecker.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-10 19:22:13.141117388 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-08 15:24:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp	2010-05-08 15:24:08.000000000 +0100
 @@ -249,8 +249,8 @@
  	{
  		exeAtt->iAttStatus = KNull;
@@ -835,9 +836,9 @@
  		|| iNoCheck)
  	{
  		aExeContainer->iExeAttList.push_back(exeAtt);
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/xmlwriter.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-10 19:22:13.141117388 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-09 13:32:35.689287394 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp	2010-05-09 13:32:35.689287000 +0100
 @@ -24,9 +24,10 @@
  */
  
@@ -868,9 +869,9 @@
  	if(!xslDestHandle)
  	{
  		delete [] filetocopy;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-10 19:22:13.709117374 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-09 13:34:57.929288271 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp	2010-05-09 13:34:57.929288000 +0100
 @@ -8,7 +8,7 @@
  #include <boost/thread/detail/config.hpp>
  #include <boost/thread/exceptions.hpp>
@@ -880,9 +881,9 @@
  #include <boost/thread/mutex.hpp>
  #include <boost/optional.hpp>
  #include <pthread.h>
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/deflate.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-10 19:22:13.757117537 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-08 14:38:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp	2010-05-08 14:38:16.000000000 +0100
 @@ -20,6 +20,7 @@
  #include "deflate.h"
  #include "h_utl.h"
@@ -901,9 +902,9 @@
  	}
  
  inline TInt HDeflateHash::Hash(const TUint8* aPtr)
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/panic.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-10 19:22:13.761118115 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-08 14:37:24.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp	2010-05-08 14:37:24.000000000 +0100
 @@ -21,7 +21,7 @@
  #include "h_utl.h"
  #include <stdlib.h>
@@ -913,9 +914,9 @@
  						"Huffman: Too many codes\n",
  						"Huffman: Invalid coding\n",
  						"Huffman: Buffer overflow\n",
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32uid/uidcrc.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-10 19:22:13.761118115 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-08 14:36:56.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp	2010-05-08 14:36:56.000000000 +0100
 @@ -55,7 +55,7 @@
  
  	for (i=1; i<4; i++)
@@ -925,9 +926,9 @@
  		uids[i] = strtoul(argv[i],&endptr,0);
  		if (*endptr!='\0')
  			{
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/cluster.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-08 14:42:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp	2010-05-08 14:42:50.000000000 +0100
 @@ -143,7 +143,9 @@
  {
  	if(iCurrentClusterNumber >= iTotalNumberOfClusters)
@@ -939,9 +940,9 @@
  	}
  	++iCurrentClusterNumber;
  }
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/dirregion.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-08 14:47:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp	2010-05-08 14:47:44.000000000 +0100
 @@ -49,7 +49,9 @@
  	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);
  	if(iClusterPtr == NULL)
@@ -1026,9 +1027,9 @@
  	}
  }
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/errorhandler.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-08 14:42:14.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp	2010-05-08 14:42:14.000000000 +0100
 @@ -22,9 +22,10 @@
  
  #include "errorhandler.h"
@@ -1042,9 +1043,9 @@
  
  /**
  ErrorHandler constructor for doing common thing required for derived 
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-08 14:43:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp	2010-05-08 14:43:40.000000000 +0100
 @@ -21,6 +21,7 @@
  */
  
@@ -1053,9 +1054,9 @@
  
  /**
  Constructor of the fat16 boot sector class
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-08 14:45:06.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp	2010-05-08 14:45:06.000000000 +0100
 @@ -21,7 +21,7 @@
  */
  
@@ -1186,9 +1187,9 @@
 +		throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__);
  	}
  }
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-08 14:48:14.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp	2010-05-08 14:48:14.000000000 +0100
 @@ -21,6 +21,7 @@
  */
  
@@ -1197,9 +1198,9 @@
  
  /**
  Constructor of the fat16 boot sector class
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-08 14:41:04.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp	2010-05-08 14:41:04.000000000 +0100
 @@ -21,6 +21,7 @@
  */
  
@@ -1379,9 +1380,9 @@
  	}
  }
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-10 19:22:13.769118155 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-08 14:43:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp	2010-05-08 14:43:16.000000000 +0100
 @@ -22,6 +22,7 @@
  */
  
@@ -1390,9 +1391,9 @@
  
  /**
  Constructor of the base boot sector class
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-10 19:22:13.773117267 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-08 14:41:36.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp	2010-05-08 14:41:36.000000000 +0100
 @@ -62,7 +62,9 @@
  		iOutputStream.open(aImageFileName,ios::out|ios::binary);
  		if(iOutputStream.fail() == true )
@@ -1404,9 +1405,9 @@
  		}
  		switch(aFileSystem)
  		{
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/longname.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-10 19:22:13.773117267 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-08 14:45:46.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp	2010-05-08 14:45:46.000000000 +0100
 @@ -21,6 +21,7 @@
  
  
@@ -1424,9 +1425,9 @@
  	}
  	FormatLongFileName(iLongName);
  	iShortName = GetShortEntryName();
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/messageimplementation.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-10 19:22:13.773117267 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-08 14:49:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp	2010-05-08 14:49:08.000000000 +0100
 @@ -23,15 +23,17 @@
  
  #include "messageimplementation.h"
@@ -1449,9 +1450,9 @@
  
  enum MessageArraySize{MAX=16};
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/host/h_utl.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp	2010-05-10 19:22:13.777117566 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/host/h_utl.cpp	2010-05-08 14:36:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp	2010-05-08 14:36:18.000000000 +0100
 @@ -177,7 +177,7 @@
  
  
@@ -1470,9 +1471,9 @@
  	if (pMinor)
  		{
  		pMinor++; 
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/inc/h_utl.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h	2010-05-10 19:22:13.777117566 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/inc/h_utl.h	2010-05-08 14:39:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h	2010-05-08 14:39:00.000000000 +0100
 @@ -65,9 +65,6 @@
  #define _stricmp strcasecmp		
  #define strnicmp strncasecmp	
@@ -1483,9 +1484,9 @@
  // hand-rolled strupr function for converting a string to all uppercase
  char* strupr(char *a);
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-10 19:22:13.781117167 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-08 14:35:28.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp	2010-05-08 14:35:28.000000000 +0100
 @@ -21,6 +21,7 @@
  
  
@@ -1494,9 +1495,9 @@
  
  
  /**
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/BLD.INF
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF	2010-05-10 19:22:13.781117167 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/BLD.INF	2010-04-29 15:03:58.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF	2010-04-29 15:03:58.000000000 +0100
 @@ -15,13 +15,14 @@
  *
  */
@@ -1513,9 +1514,9 @@
  ../maksym/hpsym.bat                 /epoc32/tools/hpsym.bat
  ../maksym/maksym.bat                /epoc32/tools/maksym.bat
  ../maksym/maksymrofs.bat            /epoc32/tools/maksymrofs.bat
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/readimage.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp	2010-05-10 19:22:13.781117167 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/readimage.mmp	2010-05-08 14:49:50.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp	2010-05-08 14:49:50.000000000 +0100
 @@ -45,15 +45,16 @@
  userinclude     ..\..\imglib\compress 
  userinclude		..\..\imglib\patchdataprocessor\include
@@ -1535,9 +1536,9 @@
  #else
  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
  OPTION    GCC -mthreads -O2 -Wno-uninitialized
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/common.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h	2010-05-10 19:22:13.785117675 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/common.h	2010-05-08 15:01:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h	2010-05-08 15:01:02.000000000 +0100
 @@ -46,7 +46,7 @@
  #define DLL_UID1	10000079
  #define EXE_UID1	1000007a
@@ -1547,9 +1548,9 @@
  {
  	EUNKNOWN_IMAGE,
  	EROM_IMAGE,
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/image_reader.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-08 15:02:34.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h	2010-05-08 15:02:34.000000000 +0100
 @@ -27,7 +27,19 @@
  
  
@@ -1571,9 +1572,9 @@
  #include <map>
  
  typedef struct tag_FILEINFO
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/rofs_image_reader.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-08 15:01:40.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h	2010-05-08 15:01:40.000000000 +0100
 @@ -65,7 +65,7 @@
  	void DumpDirStructure();
  	void DumpFileAttributes();
@@ -1583,9 +1584,9 @@
  	void ExtractImageContents();
  	void CheckFileExtension(char* aFileName,TRomBuilderEntry* aEntry,TRomNode* aNode,ofstream& aLogFile );
  	void GetCompleteNodePath(TRomNode* aNode,string& aName,char* aAppStr);
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/e32_image_reader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-08 15:00:20.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp	2010-05-08 15:00:20.000000000 +0100
 @@ -74,27 +74,27 @@
  {
  	bool aContinue = true;
@@ -1672,9 +1673,9 @@
 +	DumpInHex(const_cast<char *>("Dll ref table size"), aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl;
  }
 +
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_handler.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-08 14:59:02.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp	2010-05-08 14:59:02.000000000 +0100
 @@ -392,7 +392,8 @@
  	{
  		if(iInputFileName.empty())
@@ -1695,9 +1696,9 @@
  		}
  	}
  }
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_reader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-08 14:57:10.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp	2010-05-08 14:57:10.000000000 +0100
 @@ -173,7 +173,7 @@
  
  
@@ -1746,9 +1747,9 @@
  		// replace the source path with the original path information.
  		strcpy(aSrcPath,origPath.c_str());
  		delete[] currWorkingDir;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-08 14:58:12.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp	2010-05-08 14:58:12.000000000 +0100
 @@ -42,7 +42,7 @@
  	delete iImageReader;
  }
@@ -1786,9 +1787,9 @@
  	}
  	else
  	{
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rom_image_reader.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-10 19:22:13.789117416 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-08 14:55:36.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp	2010-05-08 14:55:36.000000000 +0100
 @@ -20,6 +20,12 @@
  #include <e32rom.h>
  #include "rom_image_reader.h"
@@ -2052,9 +2053,9 @@
  	
  }
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_build.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-08 15:04:00.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp	2010-05-08 15:04:00.000000000 +0100
 @@ -29,7 +29,7 @@
  
  #if defined(__MSVCDOTNET__) || defined(__TOOLS2__)
@@ -2107,9 +2108,9 @@
  			compression = f.iHdr->CompressionType();
  			memcpy(&iUids[0], aDest, sizeof(iUids));
  			}
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_coreimage.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-08 15:06:54.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp	2010-05-08 15:06:54.000000000 +0100
 @@ -99,7 +99,7 @@
  TInt RCoreImageReader::ReadIdentifier()
  	{
@@ -2171,9 +2172,9 @@
  	}
  
  /**
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveimage.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-04-21 13:27:26.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp	2010-04-21 13:27:26.000000000 +0100
 @@ -254,7 +254,7 @@
  	fileName.append("/");
  
@@ -2183,9 +2184,9 @@
  		{
  		if(dirEntry->d_type != DT_DIR) 
  			{
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-08 15:05:24.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp	2010-05-08 15:05:24.000000000 +0100
 @@ -82,7 +82,7 @@
  /**
  Time Stamp for Log file.
@@ -2195,9 +2196,9 @@
  	{
  	struct tm *aNewTime = NULL;
  	time_t aTime = 0;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-08 15:08:42.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h	2010-05-08 15:08:42.000000000 +0100
 @@ -24,6 +24,6 @@
  #include <e32def.h>
  
@@ -2206,10 +2207,18 @@
 +TAny GetLocalTime();
  
  #endif
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_obey.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-08 15:04:50.000000000 +0100
-@@ -283,7 +283,7 @@
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp	2010-05-12 09:50:42.805097594 +0100
+@@ -47,6 +47,7 @@
+ #include <time.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #include <e32std.h>
+ #include <e32std_private.h>
+@@ -283,7 +284,7 @@
  	iCurrentLine++;
  	iCurrentMark = ftell(iObeyFile);
  	iLine[0]='\0';
@@ -2218,7 +2227,7 @@
  	iCurrentObeyStatement = new TText[imaxLength+1];
  	strcpy((char*)iCurrentObeyStatement,(char*)iLine);
  	iNumWords = Parse();
-@@ -646,13 +646,7 @@
+@@ -646,13 +647,7 @@
  		{
  		  if (keyword == EKeywordCoreImage)
  			  {
@@ -2233,9 +2242,9 @@
  			  iReader.CopyWord(1, coreImageFileName);
  			  iReader.MarkNext(); // ready for processing extension
  			  break;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/rofsbuild.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-10 19:22:13.797117735 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-08 15:07:32.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp	2010-05-08 15:07:32.000000000 +0100
 @@ -43,15 +43,16 @@
  USERINCLUDE   ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include 
  USERINCLUDE   ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
@@ -2255,9 +2264,9 @@
  #else
  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
  OPTION    GCC -mthreads -O2 -Wno-uninitialized
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_rofs.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-10 19:22:13.793117226 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-08 15:08:18.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp	2010-05-08 15:08:18.000000000 +0100
 @@ -584,9 +584,10 @@
  			coffhead[0x54] = 0x20;
  
@@ -2272,9 +2281,9 @@
  			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
  			}
  		break;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_obey.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-10 19:22:13.805117355 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-08 14:50:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp	2010-05-08 14:50:44.000000000 +0100
 @@ -301,7 +301,7 @@
  	iCurrentLine++;
  	iCurrentMark = ftell(iObeyFile);
@@ -2299,9 +2308,9 @@
  			iReader.CopyWord(1, coreImageFileName);
  			break;
  		}
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/rombuild.mmp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-10 19:22:13.809118004 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-08 14:52:22.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp	2010-05-08 14:52:22.000000000 +0100
 @@ -41,7 +41,9 @@
  userinclude	../../imglib/compress 	../../imglib/inc 
  userinclude	../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
@@ -2322,9 +2331,9 @@
  #else
  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32
  OPTION    GCC -O2 -Wno-uninitialized -mthreads
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_rom.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-10 19:22:13.805117355 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-08 14:51:46.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp	2010-05-08 14:51:46.000000000 +0100
 @@ -1835,7 +1835,7 @@
  			TRomFile** l=rf->iPDeps;
  			FindMarked(MARK_EXE, MARK_EXE, l);
@@ -2348,9 +2357,9 @@
  
  			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
  			}
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkgfileparser.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-10 19:22:13.849689642 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-08 15:20:36.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h	2010-05-08 15:20:36.000000000 +0100
 @@ -33,6 +33,10 @@
  
  #include "pkglanguage.h"
@@ -2391,9 +2400,9 @@
  };
  
  #endif //__PKGFILEPARSER_H__
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkglanguage.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h	2010-05-10 19:22:13.849689642 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkglanguage.h	2010-05-08 15:21:16.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h	2010-05-08 15:21:16.000000000 +0100
 @@ -26,7 +26,7 @@
  
  typedef struct
@@ -2403,9 +2412,9 @@
  	unsigned long	iId;
  } SKeyword;
  
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/sisutils.h
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h	2010-05-10 19:22:13.849689642 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/sisutils.h	2010-05-08 15:19:24.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h	2010-05-08 15:19:24.000000000 +0100
 @@ -40,6 +40,9 @@
  #ifdef WIN32
  #define PATHSEPARATOR  "\\"
@@ -2416,9 +2425,9 @@
  
  //typedefs
  typedef std::string String;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/pkgfileparser.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-10 19:22:13.852617598 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-08 15:16:08.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp	2010-05-08 15:16:08.000000000 +0100
 @@ -18,13 +18,15 @@
  
  #include "sisutils.h"
@@ -2814,9 +2823,9 @@
 -	return wcsnicmp(string,option,len);
 +	return wmemcmp(string,option,len);
  }
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sis2iby.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp	2010-05-10 19:22:13.852617598 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sis2iby.cpp	2010-05-08 15:17:54.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp	2010-05-08 15:17:54.000000000 +0100
 @@ -86,12 +86,12 @@
  			break;
  		case STAT_FAILURE:
@@ -2888,9 +2897,9 @@
  	}
  
  	aIfs.seekg(0,std::ios::end);
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sisutils.cpp
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp	2010-05-10 19:22:13.852617598 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sisutils.cpp	2010-05-08 15:18:44.000000000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp	2010-05-08 15:18:44.000000000 +0100
 @@ -20,6 +20,13 @@
  #include <windows.h>
  #include <direct.h>
@@ -2970,9 +2979,9 @@
  #endif
  		if(status == EFalse)
  			break;
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/cpp-raptor/group/exports.inf
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/cpp-raptor/group/exports.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf	2010-05-10 19:22:13.856618037 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/cpp-raptor/group/exports.inf	2010-05-09 13:37:03.425787894 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/cpp-raptor/group/exports.inf	2010-05-09 13:37:03.425787000 +0100
 @@ -15,6 +15,6 @@
  *
  */
@@ -2983,9 +2992,9 @@
 +../win32/bin/cpp.exe ../../tools/sbs/win32/bv/bin/cpp.exe
 +../win32/i686-pc-mingw32/bin/cc1.exe ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe
 +../win32/i686-pc-mingw32/bin/libiconv-2.dll ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/group/exports.inf
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/group/exports.inf
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf	2010-05-10 19:22:17.197117642 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/group/exports.inf	2010-05-09 13:36:29.473288352 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/group/exports.inf	2010-05-09 13:36:29.473288000 +0100
 @@ -15,209 +15,209 @@
  *
  */
@@ -3402,9 +3411,9 @@
 +../win32/bin/sbs_descramble.exe ../../tools/sbs/win32/bin/sbs_descramble.exe
 +../win32/bin/talonctl.exe ../../tools/sbs/win32/bin/talonctl.exe
 +../win32/bin/talon.exe ../../tools/sbs/win32/bin/talon.exe
-diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/lib/config/gcc.xml
+diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/lib/config/gcc.xml
 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml	2010-05-10 19:22:17.201117662 +0100
-+++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/lib/config/gcc.xml	2010-05-08 13:35:13.030060000 +0100
++++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/lib/config/gcc.xml	2010-05-08 13:35:13.030060000 +0100
 @@ -26,7 +26,7 @@
  		<!-- used by FLM code -->
  		<set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/>
@@ -3439,4 +3448,4 @@
  		<set name='LIBS.WIN32' value='$(LIBS)'/>
  		<set name='LIBS.LINUX' value='$(LIBS) pthread'/>
 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/python: raptor_version.py.bak
-Only in /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util: build
+Only in /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util: build
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/patch-files/linux/build/sbsv2/raptor/lib/config/gcc.xml
--- a/cross-plat-dev-utils/patch-files/linux/build/sbsv2/raptor/lib/config/gcc.xml	Wed May 12 09:52:26 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
-
-	<!-- build configurations for GCC compilers -->
-	<var name="tools2_base" extends="root">
-
-		<varRef ref="default.interfaces"/>
-		<varRef ref="default.locations"/>
-		<!-- picked up from the Environment -->
-		<env name='RANLIB' default='$(GCCPREFIX)ranlib$(DOTEXE)' type='tool'/>
-		<env name='GCC' default='$(GCCPREFIX)g++$(DOTEXE)' type='tool'/>
-		<env name='AR' default='$(GCCPREFIX)ar$(DOTEXE)' type='tool'/>
-
-		<!-- interfaces -->
-		<set name="INTERFACE.exe" value="Tools.exe"/>
-		<set name="INTERFACE.lib" value="Tools.lib"/>
-
-		<!-- Java used by Trace Compiler -->
-		<env name='JAVA_HOME' default='' type='path'/>
-		<env name='JAVATC' default='$(JAVA_HOME)/bin/java' type='tool'/>
-
-		<!-- link to bld.inf and mmp platform names -->
-		<set name='TRADITIONAL_PLATFORM' value='TOOLS2'/>
-		<set name='VARIANTPLATFORM' value='tools2'/>
-
-		<!-- used by FLM code -->
-		<set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/>
-
-		<set name='CFLAGS' value='-std=c++0x -fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
-
-		<!-- msys based programs sometimes don't search the path properly.
-		COMPILER_PATH can be set to tell gcc where to find
-		as.exe (sometimes it doesn't and a build step fails).
-		-->
-		<set name='COMPILER_PATH.WIN32' value='$(SBS_HOME)/win32/mingw/bin'/>
-		<set name='COMPILER_PATH.LINUX' value=''/>
-
-		<set name='CFLAGS.WIN32' value=''/>
-
-		<!-- macro definitions set by mmps etc -->
-		<set name='CDEFS' value='$(MMPDEFS)'/>
-
-
-		<set name='CDEFS.DEFAULT' value='__SYMBIAN32__ __TOOLS__ __TOOLS2__ __EXE__ __SUPPORT_CPP_EXCEPTIONS__ __PRODUCT_INCLUDE__="$(PRODUCT_INCLUDE)"'/>
-		<set name='CDEFS.WIN32' value='$(CDEFS.DEFAULT) _WIN32 WIN32 _WINDOWS __TOOLS2_WINDOWS__'/>
-		<set name='CDEFS.LINUX' value='$(CDEFS.DEFAULT) __LINUX__ __TOOLS2_LINUX__'/>
-
-		<set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc/gcc.h'/>
- 
-		<set name='OPT.D' value='-D'/>
-		<set name='OPT.L' value='-L'/>
-		<set name='OPT.l' value='-l'/>
-		<set name='OPT.O' value='-o '/>
-		<set name='OPT.PREINCLUDE' value='-include '/>
-		<set name='OPT.SYSTEMINCLUDE' value='-isystem '/>
-		<set name='OPT.USERINCLUDE' value='-I '/>
-
-		<set name='SYSTEMINCLUDE' value=''/>
-
-		<set name='LINKER' value='$(GCC)'/>
-		<set name='LFLAGS' value=''/>
-		<set name='STATICLIBRARY' value=''/>
-		<set name='LIBS' value=''/>
-		<set name='LIBS.WIN32' value='$(LIBS)'/>
-		<set name='LIBS.LINUX' value='$(LIBS) pthread'/>
-
-		<set name='PLATMACROS.WINDOWS' value='GCC32 TOOLS2 TOOLS2_WINDOWS'/>
-		<set name='PLATMACROS.LINUX' value='GCC32 TOOLS2 TOOLS2_LINUX'/>
-
-		<set name='ARCHIVER' value='$(AR)'/>
-		<set name='AFLAGS' value='cr'/>
-
-		<set name='MMPDEFS' value=''/>
-		<set name='TARGET' value=''/>
-		<set name='TARGETTYPE' value=''/>
-		<set name='BLDINF_OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
-
-		<set name='OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
-		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2$$(TOOLPLATFORMDIR)'/>
-	</var>
-
-	<var name="tools2_deb" extends="tools2_base">
-		<set name='TOOLSPATH' value=''/> <!-- do not install -->
-		<set name='VARIANTTYPE' value='deb'/>
-
-		<append name='CFLAGS' value='-g'/>
-		<append name='CDEFS' value='_DEBUG'/>
-		<append name='RELEASEPATH' value='/deb' separator=''/>
-	</var>
-
-	<var name="tools2_rel" extends="tools2_base">
-		<set name='TOOLSPATH' value='$(EPOCTOOLS)'/> <!-- install -->
-		<set name='VARIANTTYPE' value='rel'/>
-
-		<append name='CFLAGS' value='-s'/>
-		<append name='CDEFS' value='NDEBUG'/>
-		<append name='RELEASEPATH' value='/rel' separator=''/>
-	</var>
-
-	<group name="tools2">
-		<varRef ref='tools2_rel'/>
-		<varRef ref='tools2_deb'/>
-	</group>
-
-</build>
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/patch-files/linux/linux_build/sbsv2/raptor/lib/config/gcc.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cross-plat-dev-utils/patch-files/linux/linux_build/sbsv2/raptor/lib/config/gcc.xml	Thu May 13 08:38:18 2010 +0100
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
+
+	<!-- build configurations for GCC compilers -->
+	<var name="tools2_base" extends="root">
+
+		<varRef ref="default.interfaces"/>
+		<varRef ref="default.locations"/>
+		<!-- picked up from the Environment -->
+		<env name='RANLIB' default='$(GCCPREFIX)ranlib$(DOTEXE)' type='tool'/>
+		<env name='GCC' default='$(GCCPREFIX)g++$(DOTEXE)' type='tool'/>
+		<env name='AR' default='$(GCCPREFIX)ar$(DOTEXE)' type='tool'/>
+
+		<!-- interfaces -->
+		<set name="INTERFACE.exe" value="Tools.exe"/>
+		<set name="INTERFACE.lib" value="Tools.lib"/>
+
+		<!-- Java used by Trace Compiler -->
+		<env name='JAVA_HOME' default='' type='path'/>
+		<env name='JAVATC' default='$(JAVA_HOME)/bin/java' type='tool'/>
+
+		<!-- link to bld.inf and mmp platform names -->
+		<set name='TRADITIONAL_PLATFORM' value='TOOLS2'/>
+		<set name='VARIANTPLATFORM' value='tools2'/>
+
+		<!-- used by FLM code -->
+		<set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/>
+
+		<set name='CFLAGS' value='-std=c++0x -fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
+
+		<!-- msys based programs sometimes don't search the path properly.
+		COMPILER_PATH can be set to tell gcc where to find
+		as.exe (sometimes it doesn't and a build step fails).
+		-->
+		<set name='COMPILER_PATH.WIN32' value='$(SBS_HOME)/win32/mingw/bin'/>
+		<set name='COMPILER_PATH.LINUX' value=''/>
+
+		<set name='CFLAGS.WIN32' value=''/>
+
+		<!-- macro definitions set by mmps etc -->
+		<set name='CDEFS' value='$(MMPDEFS)'/>
+
+
+		<set name='CDEFS.DEFAULT' value='__SYMBIAN32__ __TOOLS__ __TOOLS2__ __EXE__ __SUPPORT_CPP_EXCEPTIONS__ __PRODUCT_INCLUDE__="$(PRODUCT_INCLUDE)"'/>
+		<set name='CDEFS.WIN32' value='$(CDEFS.DEFAULT) _WIN32 WIN32 _WINDOWS __TOOLS2_WINDOWS__'/>
+		<set name='CDEFS.LINUX' value='$(CDEFS.DEFAULT) __LINUX__ __TOOLS2_LINUX__'/>
+
+		<set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc/gcc.h'/>
+ 
+		<set name='OPT.D' value='-D'/>
+		<set name='OPT.L' value='-L'/>
+		<set name='OPT.l' value='-l'/>
+		<set name='OPT.O' value='-o '/>
+		<set name='OPT.PREINCLUDE' value='-include '/>
+		<set name='OPT.SYSTEMINCLUDE' value='-isystem '/>
+		<set name='OPT.USERINCLUDE' value='-I '/>
+
+		<set name='SYSTEMINCLUDE' value=''/>
+
+		<set name='LINKER' value='$(GCC)'/>
+		<set name='LFLAGS' value=''/>
+		<set name='STATICLIBRARY' value=''/>
+		<set name='LIBS' value=''/>
+		<set name='LIBS.WIN32' value='$(LIBS)'/>
+		<set name='LIBS.LINUX' value='$(LIBS) pthread'/>
+
+		<set name='PLATMACROS.WINDOWS' value='GCC32 TOOLS2 TOOLS2_WINDOWS'/>
+		<set name='PLATMACROS.LINUX' value='GCC32 TOOLS2 TOOLS2_LINUX'/>
+
+		<set name='ARCHIVER' value='$(AR)'/>
+		<set name='AFLAGS' value='cr'/>
+
+		<set name='MMPDEFS' value=''/>
+		<set name='TARGET' value=''/>
+		<set name='TARGETTYPE' value=''/>
+		<set name='BLDINF_OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
+
+		<set name='OUTPUTPATH' value='$(SBS_BUILD_DIR)'/>
+		<set name='RELEASEPATH' value='$(EPOCROOT)/epoc32/release/tools2$$(TOOLPLATFORMDIR)'/>
+	</var>
+
+	<var name="tools2_deb" extends="tools2_base">
+		<set name='TOOLSPATH' value=''/> <!-- do not install -->
+		<set name='VARIANTTYPE' value='deb'/>
+
+		<append name='CFLAGS' value='-g'/>
+		<append name='CDEFS' value='_DEBUG'/>
+		<append name='RELEASEPATH' value='/deb' separator=''/>
+	</var>
+
+	<var name="tools2_rel" extends="tools2_base">
+		<set name='TOOLSPATH' value='$(EPOCTOOLS)'/> <!-- install -->
+		<set name='VARIANTTYPE' value='rel'/>
+
+		<append name='CFLAGS' value='-s'/>
+		<append name='CDEFS' value='NDEBUG'/>
+		<append name='RELEASEPATH' value='/rel' separator=''/>
+	</var>
+
+	<group name="tools2">
+		<varRef ref='tools2_rel'/>
+		<varRef ref='tools2_deb'/>
+	</group>
+
+</build>
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/patch_upstream.pl
--- a/cross-plat-dev-utils/patch_upstream.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/patch_upstream.pl	Thu May 13 08:38:18 2010 +0100
@@ -14,7 +14,7 @@
 use strict;
 use get_baseline;
 use perl_run;
-use set_epocroot;
+use places;
 use get_hostplatform_dir;
 use check_os;
 use File::Spec;
@@ -49,11 +49,10 @@
 die "*** Error: can't execute the patch tool ***", if ($rc);
 $baseline_dir = abs_path($baseline_dir);
 perl_run("get_upstream.pl $baseline_dir") and die $!;
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
+my $epocroot = get_epocroot();
 if (!$patch_in) {
 	my $baseline_rev = get_baseline();
-	$patch_in = File::Spec->catfile("$epocroot","build","cross-plat-dev-utils",
+	$patch_in = File::Spec->catfile(get_pkg_dir(),"cross-plat-dev-utils",
 		"patch-files","diffs","patch-$baseline_rev.patch");
 }
 die "*** Error: can't find patch file \"$patch_in\" ***", unless ( -f $patch_in);
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/places.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cross-plat-dev-utils/places.pm	Thu May 13 08:38:18 2010 +0100
@@ -0,0 +1,89 @@
+#!/usr/bin/perl
+# Copyright (c) 2010 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Mike Kinghan, mikek@symbian.org, for Symbian Foundation Ltd - initial contribution.
+
+# Routines to get/set some essential paths.
+
+use strict;
+use Cwd;
+use Cwd 'abs_path';
+use File::Spec;
+
+# get the package directory
+sub get_pkg_dir()
+{
+	return abs_path("..");	
+}
+
+# get the epoc32 directory without insisting it exists
+sub get_epoc32_path()
+{
+	my $epocroot = get_epocroot();
+	my $epoc32 = File::Spec->catfile($epocroot,"epoc32");
+	return $epoc32;
+}
+
+# get the epoc32 directory, insisting it exists
+sub get_epoc32_dir()
+{
+	my $epoc32 = get_epoc32_path();
+	die "*** Error: directory \"$epoc32\" does not exist ***",
+		unless ( -d "$epoc32");	
+	return $epoc32;
+}
+
+# Get the EPOCROOT directory, using the environment setting if it exists,
+# otherwise assuming the parent of the package dir.
+sub get_epocroot()
+{
+	my $epocroot = $ENV{'EPOCROOT'};
+    unless ($epocroot) {
+		$epocroot = abs_path(File::Spec->catfile("..",".."));
+		if (-d "$epocroot") {
+        	print ">>> EPOCROOT not defined. Assuming \"$epocroot\"\n";
+		} else {
+			die "*** Error: EPOCROOT not defined and guess \"$epocroot\" " .
+				"does not exist ***";
+		}
+    	$ENV{'EPOCROOT'}=$epocroot;
+		print ">>> EPOCROOT=\"$epocroot\"\n";
+    }
+	if (! -d "$epocroot") {
+		die "*** Error: directory \"$epocroot\" does not exist ***";
+	}
+	else {
+		my $epoc32 = File::Spec->catfile($epocroot,"epoc32");
+		unless ( -d "$epoc32") {
+			print "!!! Warning: No epoc32 die under EPOCROOT !!!\n";
+		}
+	}
+	return $epocroot;
+}
+
+sub get_sbs_home()
+{
+	my $sbs_home = $ENV{'SBS_HOME'};
+	unless($sbs_home) {
+		$sbs_home = File::Spec->catfile(get_pkg_dir(),"sbsv2","raptor");
+		if ( -d "$sbs_home") {
+        	print ">>> SBS_HOME not defined. Assuming \"$sbs_home\"\n";
+		} else {
+			die "*** Error: SBS_HOME not defined and guess \"$sbs_home\" " .
+				"does not exist ***";
+		}
+		$ENV{'SBS_HOME'} = $sbs_home;
+	}
+	unless ( -d "$sbs_home") {
+		die "*** Error: directory \"$sbs_home\" does not exist ***";
+	}
+	return $sbs_home;
+}
+
+1;
+
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/set_epocroot.pm
--- a/cross-plat-dev-utils/set_epocroot.pm	Wed May 12 09:52:26 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/perl
-# Copyright (c) 2010 Symbian Foundation Ltd
-# This component and the accompanying materials are made available
-# under the terms of the License "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:
-# Mike Kinghan, mikek@symbian.org, for Symbian Foundation Ltd - initial contribution.
-
-# Routine to set EPOCROOT if not defined; is set to fully qualified name of ../..
-
-use strict;
-use Cwd;
-sub set_epocroot()
-{
-    if (!$ENV{'EPOCROOT'}) {
-        print ">>> EPOCROOT not defined. Assuming ../..\n";
-        my $cwd = getcwd;
-        chdir "../..";
-    	print ">>> EPOCROOT=",getcwd,"\n";
-    	$ENV{'EPOCROOT'}=getcwd;
-    	chdir $cwd;
-    }
-}
-
-1;
-
diff -r 301c3edbdaa1 -r 787612182dd0 cross-plat-dev-utils/weed_backups.pl
--- a/cross-plat-dev-utils/weed_backups.pl	Wed May 12 09:52:26 2010 +0100
+++ b/cross-plat-dev-utils/weed_backups.pl	Thu May 13 08:38:18 2010 +0100
@@ -13,15 +13,14 @@
 use strict;
 use usage;
 use File::Spec;
-use set_epocroot;
+use places;
 
 sub delete_backups($);
 
 usage(\@ARGV,"This script deletes all files in the package directory " .
 	"with names ending in '~'\n");
-set_epocroot();
-my $epocroot = $ENV{'EPOCROOT'};
-my $build_pkg_dir = File::Spec->catfile("$epocroot","build");
+my $epocroot = get_epocroot();
+my $build_pkg_dir = get_pkg_dir();
 my $deletes = 0;
 delete_backups($build_pkg_dir);
 print ">>> $deletes files deleted\n"; 
diff -r 301c3edbdaa1 -r 787612182dd0 e32tools/elf2e32/source/parametermanager.cpp
--- a/e32tools/elf2e32/source/parametermanager.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/e32tools/elf2e32/source/parametermanager.cpp	Thu May 13 08:38:18 2010 +0100
@@ -647,7 +647,7 @@
 			parser(this, "help", 0, 0);
 		}
 
-		parser(this, const_cast<char*>(aName.c_str()), optval, aDesc);
+		parser(this, aName.c_str(), optval, aDesc);
 	}
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 e32tools/elf2e32/source/parametermanager.h
--- a/e32tools/elf2e32/source/parametermanager.h	Wed May 12 09:52:26 2010 +0100
+++ b/e32tools/elf2e32/source/parametermanager.h	Thu May 13 08:38:18 2010 +0100
@@ -81,7 +81,7 @@
 	typedef std::map<string, const OptionDesc *, OptionCompare> OptionMap;
 	typedef vector<char *> LibSearchPaths;
 
-	typedef void (*ParserFn)(ParameterManager *, char *, char *, const OptionDesc *);
+	typedef void (*ParserFn)(ParameterManager *, char const *, char const *, const OptionDesc *);
 
 
 	#define DECLARE_PARAM_PARSER(name) \
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imgcheck/libimgutils/inc/romfsentry.h
--- a/imgtools/imgcheck/libimgutils/inc/romfsentry.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imgcheck/libimgutils/inc/romfsentry.h	Thu May 13 08:38:18 2010 +0100
@@ -32,7 +32,7 @@
 class RomImageFSEntry 
 {
 public:
-	RomImageFSEntry (char* aName) 
+	RomImageFSEntry (char const* aName) 
 	: iName(aName), iSibling(0), iChildren(0)
 	{
 	}
@@ -117,7 +117,7 @@
 class RomImageDirEntry : public RomImageFSEntry
 {
 public:
-	RomImageDirEntry(char* aName) : RomImageFSEntry(aName)
+	RomImageDirEntry(char const* aName) : RomImageFSEntry(aName)
 	{
 	}
 	~RomImageDirEntry(void)
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imgcheck/libimgutils/src/romreader.cpp
--- a/imgtools/imgcheck/libimgutils/src/romreader.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imgcheck/libimgutils/src/romreader.cpp	Thu May 13 08:38:18 2010 +0100
@@ -53,7 +53,7 @@
 RomReader::RomReader(const char* aFile, EImageType aImgType) 
 : ImageReader(aFile), iImageHeader(0), iData(0), iImgType(aImgType)
 {
-	iRomImageRootDirEntry = new RomImageDirEntry(const_cast<char *>(""));
+	iRomImageRootDirEntry = new RomImageDirEntry("");
 }
 
 /** 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/include/errorhandler.h
--- a/imgtools/imglib/filesystem/include/errorhandler.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/include/errorhandler.h	Thu May 13 08:38:18 2010 +0100
@@ -36,8 +36,8 @@
 class ErrorHandler
 {
 	public:
-		ErrorHandler(int aMessageIndex,char* aSubMessage,char* aFileName, int aLineNumber);
-        ErrorHandler(int aMessageIndex, char* aFileName, int aLineNumber);
+		ErrorHandler(int aMessageIndex,char const * aSubMessage,char const * aFileName, int aLineNumber);
+        ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber);
 		virtual ~ErrorHandler();
 		void Report();
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/include/messagehandler.h
--- a/imgtools/imglib/filesystem/include/messagehandler.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/include/messagehandler.h	Thu May 13 08:38:18 2010 +0100
@@ -36,9 +36,9 @@
     public:
 		static Message *GetInstance();
 		static void CleanUp();
-		static void StartLogging(char *filename);
-		static void CreateMessageFile(char *fileName);
-		static void ReportMessage(int aMsgType, int aMsgIndex,char* aName);
+		static void StartLogging(char const *filename);
+		static void CreateMessageFile(char const *fileName);
+		static void ReportMessage(int aMsgType, int aMsgIndex,char const* aName);
 
     private:
 		static Message* iInstance;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/include/messageimplementation.h
--- a/imgtools/imglib/filesystem/include/messageimplementation.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/include/messageimplementation.h	Thu May 13 08:38:18 2010 +0100
@@ -84,7 +84,7 @@
 		// display message to output device
 		virtual void Output(const char *aName) =0;
 		// start logging to a file
-		virtual void StartLogging(char *fileName)=0;
+		virtual void StartLogging(char const *fileName)=0;
 		virtual void ReportMessage(int aMsgType, int aMsgIndex,...)=0;
 		virtual void InitializeMessages()=0;
 };
@@ -105,7 +105,7 @@
 		char* GetMessageString(int errorIndex);
 		void Output(const char *aName);
 		void LogOutput(const char *aString);
-		void StartLogging(char *fileName);
+		void StartLogging(char const *fileName);
 		void ReportMessage(int aMsgType, int aMsgIndex,...);
 		void InitializeMessages();
     private:
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/cluster.cpp
--- a/imgtools/imglib/filesystem/source/cluster.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/cluster.cpp	Thu May 13 08:38:18 2010 +0100
@@ -144,8 +144,8 @@
 	if(iCurrentClusterNumber >= iTotalNumberOfClusters)
 	{
     	throw ErrorHandler(IMAGESIZETOOBIG,
-			const_cast<char *>("Occupied number of clusters count exceeded than available clusters"),
-			const_cast<char *>(__FILE__),__LINE__);
+			"Occupied number of clusters count exceeded than available clusters",
+			__FILE__,__LINE__);
 	}
 	++iCurrentClusterNumber;
 }
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/dirregion.cpp
--- a/imgtools/imglib/filesystem/source/dirregion.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/dirregion.cpp	Thu May 13 08:38:18 2010 +0100
@@ -49,9 +49,7 @@
 	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);
 	if(iClusterPtr == NULL)
 	{
-		throw ErrorHandler(CLUSTERERROR,
-		const_cast<char *>("Instance creation error"),
-		const_cast<char *>( __FILE__), __LINE__);
+		throw ErrorHandler(CLUSTERERROR,"Instance creation error",__FILE__,__LINE__);
 	}
 	iClusterSize = iClusterPtr->GetClusterSize();
 }
@@ -119,7 +117,7 @@
 	aOutPutStream.flush();
 	if(aOutPutStream.bad())
 	{
-		throw ErrorHandler(FILEWRITEERROR, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(FILEWRITEERROR,__FILE__,__LINE__);
 
 	}
 }
@@ -178,7 +176,7 @@
 	}
 	else
 	{
-		throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(EMPTYFILENAME,__FILE__,__LINE__);
 	}
 }
 
@@ -250,7 +248,7 @@
 	if(tempString.length() == 0)
 	{
 		tempString.erase();
-		throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(EMPTYFILENAME,__FILE__,__LINE__);
 	}
 	else
 	{
@@ -317,8 +315,8 @@
 	iInputStream.open(aEntry->GetFilePath().c_str(),Ios::binary);
 	if(iInputStream.fail() == true )
 	{
-		throw ErrorHandler(FILEOPENERROR,const_cast<char *>(aEntry->GetFilePath().c_str()),
-			const_cast<char *>(__FILE__),__LINE__);
+		throw ErrorHandler(FILEOPENERROR,aEntry->GetFilePath().c_str(),
+			__FILE__,__LINE__);
 	}
 	else
 	{
@@ -328,8 +326,7 @@
 		char* dataBuffer = (char*)malloc((unsigned int)fileSize);
 		if(dataBuffer == 0)
 		{
-			throw ErrorHandler(MEMORYALLOCATIONERROR,
-				const_cast<char *>(__FILE__), __LINE__);
+			throw ErrorHandler(MEMORYALLOCATIONERROR,__FILE__,__LINE__);
 		}
 		//Read the whole file in one short
 		iInputStream.read (dataBuffer,fileSize);
@@ -337,8 +334,8 @@
 		Long64 bytesRead = (unsigned int)iInputStream.tellg();
 		if((iInputStream.bad()) || (bytesRead != fileSize))
 		{
-			throw ErrorHandler(FILEREADERROR,const_cast<char *>(aEntry->GetFilePath().c_str()),
-				const_cast<char *>(__FILE__), __LINE__);
+			throw ErrorHandler(FILEREADERROR,aEntry->GetFilePath().c_str(),
+				__FILE__, __LINE__);
 		}
 		String clusterData(dataBuffer,(unsigned int)bytesRead);
 		PushStringIntoClusterMap(iClusterPtr->GetCurrentClusterNumber(),clusterData,iClusterSize,aEntry->GetEntryAttribute());
@@ -550,12 +547,12 @@
 		}
 		if(aNodeList.front()->GetEntryList()->size() <= 0)
 		{
-			throw ErrorHandler(NOENTRIESFOUND, const_cast<char *>(__FILE__), __LINE__);
+			throw ErrorHandler(NOENTRIESFOUND,__FILE__,__LINE__);
 		}
 	}
 	else
 	{
-		throw ErrorHandler(ROOTNOTFOUND, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(ROOTNOTFOUND,__FILE__,__LINE__);
 	}
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/errorhandler.cpp
--- a/imgtools/imglib/filesystem/source/errorhandler.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/errorhandler.cpp	Thu May 13 08:38:18 2010 +0100
@@ -42,7 +42,7 @@
 @param aFileName - File name from where the error is thrown
 @param aLineNumber - Line number from where the error is thrown
 */
-ErrorHandler::ErrorHandler(int aMessageIndex, char* aSubMessage, char* aFileName, int aLineNumber)
+ErrorHandler::ErrorHandler(int aMessageIndex, char const* aSubMessage, char const* aFileName, int aLineNumber)
                             :iSubMessage(aSubMessage), iFileName(aFileName), iLineNumber(aLineNumber)
 {
 	iMessageIndex = aMessageIndex;
@@ -61,7 +61,7 @@
 @param aFileName - File name from where the error is thrown
 @param aLineNumber - Line number from where the error is thrown
 */
-ErrorHandler::ErrorHandler(int aMessageIndex, char* aFileName, int aLineNumber)
+ErrorHandler::ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber)
                             : iFileName(aFileName), iLineNumber(aLineNumber)
 {
 	iMessageIndex = aMessageIndex;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/fat16filesystem.cpp
--- a/imgtools/imglib/filesystem/source/fat16filesystem.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/fat16filesystem.cpp	Thu May 13 08:38:18 2010 +0100
@@ -133,7 +133,7 @@
 	ComputeClusterSizeInBytes();
 	ComputeRootDirSectors();
 	ComputeBytesPerSector();
-	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT16"));
+	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG,"FAT16");
 }
 
 /**
@@ -145,7 +145,7 @@
 */
 void CFat16FileSystem::WriteBootSector(ofstream& aOutPutStream)
 {
-	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,const_cast<char *>("FAT16"));
+	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,"FAT16");
 	aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT16BootSector.BytesPerSector());
 	aOutPutStream.flush();
 }
@@ -196,7 +196,7 @@
 		aFatString.append((totalFatEntries - clusterCounter)*2, 0);
 	}
 
-	MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT16"));
+	MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,"FAT16");
 
 	// Write FAT table multiple times depending upon the No of FATS set.
 	unsigned int noOfFats = iFAT16BootSector.NumberOfFats();
@@ -258,15 +258,11 @@
 	iTotalClusters = iTotalDataSectors / iFAT16BootSector.SectorsPerCluster();
 	if(iTotalClusters < KMinimumFat16Clusters)
 	{
-		throw ErrorHandler(BOOTSECTORERROR,
-			const_cast<char *>("Low Partition Size"),
-			const_cast<char *>(__FILE__),__LINE__);
+		throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__,__LINE__);
 	}
 	if(iTotalClusters > KMaximumFat16Clusters)
 	{
-		throw ErrorHandler(BOOTSECTORERROR,
-			const_cast<char *>("High Partition Size"),
-			const_cast<char *>(__FILE__),__LINE__);
+		throw ErrorHandler(BOOTSECTORERROR,"High Partition Size",__FILE__,__LINE__);
 	}
 	
 }
@@ -317,6 +313,6 @@
 	catch(...)
 	{
 		delete dirRegionPtr;
-		throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);
 	}
 }
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/fat32filesystem.cpp
--- a/imgtools/imglib/filesystem/source/fat32filesystem.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/fat32filesystem.cpp	Thu May 13 08:38:18 2010 +0100
@@ -160,7 +160,7 @@
 	ComputeClusterSizeInBytes();
 	ComputeRootDirSectors();
 	ComputeBytesPerSector();
-	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT32"));
+	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG,"FAT32");
 }
 
 /**
@@ -173,7 +173,7 @@
 */
 void CFat32FileSystem::WriteBootSector(ofstream& aOutPutStream)
 {
-	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, const_cast<char *>("FAT32"));
+	MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,"FAT32");
 	aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT32BootSector.BytesPerSector());
 	aOutPutStream.flush();
 }
@@ -230,7 +230,7 @@
 		aFatString.append((totalFatEntries - clusterCounter)*4, 0);
 	}
 
-	MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT32"));
+	MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,"FAT32");
 
 	//Write FAT table multiple times depending on the value of No of FATS set.
 	unsigned int noOfFats = iFAT32BootSector.NumberOfFats();
@@ -369,15 +369,11 @@
  	iTotalClusters = totalDataSectors / iFAT32BootSector.SectorsPerCluster();
 	if(iTotalClusters < KMinimumFat32Clusters)
 	{
-		throw ErrorHandler(BOOTSECTORERROR,
-			const_cast<char *>("Low Partition Size"),
-			const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__,__LINE__);
 	}
 	else if(iTotalClusters > KMaximumFat32Clusters)
 	{
-		throw ErrorHandler(BOOTSECTORERROR,
-			const_cast<char *>("high Partition Size"),
-			const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(BOOTSECTORERROR,"high Partition Size",__FILE__,__LINE__);
 	}
 }
 /**
@@ -430,7 +426,7 @@
 	{
 		delete dirRegionPtr;
 		dirRegionPtr = NULL;
-		throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);
 	}
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/filesysteminterface.cpp
--- a/imgtools/imglib/filesystem/source/filesysteminterface.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/filesysteminterface.cpp	Thu May 13 08:38:18 2010 +0100
@@ -62,9 +62,7 @@
 		iOutputStream.open(aImageFileName,ios::out|ios::binary);
 		if(iOutputStream.fail() == true )
 		{
-			throw ErrorHandler(FILEOPENERROR,
-				const_cast<char *>(aImageFileName),
-				const_cast<char *>(__FILE__), __LINE__);
+			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__,__LINE__);
 		}
 		switch(aFileSystem)
 		{
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/longname.cpp
--- a/imgtools/imglib/filesystem/source/longname.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/longname.cpp	Thu May 13 08:38:18 2010 +0100
@@ -49,7 +49,7 @@
 	iLongNameLength = iLongName.length();
 	if(iLongNameLength == 0)
 	{
-		throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
+		throw ErrorHandler(EMPTYFILENAME,__FILE__,__LINE__);
 	}
 	FormatLongFileName(iLongName);
 	iShortName = GetShortEntryName();
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/messagehandler.cpp
--- a/imgtools/imglib/filesystem/source/messagehandler.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/messagehandler.cpp	Thu May 13 08:38:18 2010 +0100
@@ -51,7 +51,7 @@
 @param aFileName
 Name of the Log File
 */
-void MessageHandler::StartLogging(char *aFileName)
+void MessageHandler::StartLogging(char const *aFileName)
 {
     GetInstance()->StartLogging(aFileName);
 }
@@ -74,7 +74,7 @@
 @internalComponent
 @released
 */
-void MessageHandler::ReportMessage(int aMsgType, int aMsgIndex,char* aName)
+void MessageHandler::ReportMessage(int aMsgType, int aMsgIndex,char const* aName)
 {
 	GetInstance()->ReportMessage(aMsgType,aMsgIndex,aName);
 }
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/imglib/filesystem/source/messageimplementation.cpp
--- a/imgtools/imglib/filesystem/source/messageimplementation.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/imglib/filesystem/source/messageimplementation.cpp	Thu May 13 08:38:18 2010 +0100
@@ -204,7 +204,7 @@
 
 @param aFileName - Name of the Log file
 */
-void MessageImplementation::StartLogging(char *aFileName)
+void MessageImplementation::StartLogging(char const *aFileName)
 {
 	char logFile[1024];
 	FILE *fptr;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/inc/common.h
--- a/imgtools/romtools/readimage/inc/common.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/inc/common.h	Thu May 13 08:38:18 2010 +0100
@@ -98,7 +98,7 @@
 	void Report();
 };
 
-ostream& DumpInHex(char* aDesc, TUint32 aData, bool aContinue = false,TUint aDataWidth=8,\
-				   char aFiller='0', TUint aMaxDescWidth=28);
+ostream& DumpInHex(char const * aDesc, TUint32 aData, bool aContinue = false,
+			TUint aDataWidth=8, char aFiller='0', TUint aMaxDescWidth=28);
 
 #endif //__IMAGE_READER_COMMON_H_
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/inc/rofs_image_reader.h
--- a/imgtools/romtools/readimage/inc/rofs_image_reader.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/inc/rofs_image_reader.h	Thu May 13 08:38:18 2010 +0100
@@ -68,7 +68,7 @@
 	void SetSeek(streampos aOff, std::ios_base::seekdir aStartPos);
 	void ExtractImageContents();
 	void CheckFileExtension(char* aFileName,TRomBuilderEntry* aEntry,TRomNode* aNode,ofstream& aLogFile );
-	void GetCompleteNodePath(TRomNode* aNode,string& aName,char* aAppStr);
+	void GetCompleteNodePath(TRomNode* aNode,string& aName,char const* aAppStr);
 	void WriteEntryToFile(char* aFileName,TRomNode* aNode,ofstream& aLogFile);
 
 	void GetFileInfo(FILEINFOMAP &aFileMap);
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/src/common.cpp
--- a/imgtools/romtools/readimage/src/common.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/src/common.cpp	Thu May 13 08:38:18 2010 +0100
@@ -40,7 +40,7 @@
 	*out << "Usage Error:" << iErrMessage.c_str() << endl;
 }
 
-ostream& DumpInHex(char* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \
+ostream& DumpInHex(char const* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \
 				   char aFiller, TUint aMaxDescWidth)
 {
 	TUint aDescLen = strlen(aDesc);
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/src/e32_image_reader.cpp
--- a/imgtools/romtools/readimage/src/e32_image_reader.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/src/e32_image_reader.cpp	Thu May 13 08:38:18 2010 +0100
@@ -74,27 +74,27 @@
 {
 	bool aContinue = true;
 
-	DumpInHex(const_cast<char *>("Size"), aE32Image.iSize ) << endl;
-	DumpInHex(const_cast<char *>("Uids"),aE32Image.iOrigHdr->iUid1);
-	DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid2, aContinue);
-	DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid3, aContinue);
-	DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl;
+	DumpInHex("Size", aE32Image.iSize ) << endl;
+	DumpInHex("Uids", aE32Image.iOrigHdr->iUid1);
+	DumpInHex(" ", aE32Image.iOrigHdr->iUid2, aContinue);
+	DumpInHex(" ", aE32Image.iOrigHdr->iUid3, aContinue);
+	DumpInHex(" ", aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl;
 
 	
-	DumpInHex(const_cast<char *>("Entry point"), aE32Image.iOrigHdr->iEntryPoint ) << endl;
-	DumpInHex(const_cast<char *>("Code start addr") ,aE32Image.iOrigHdr->iCodeBase)<< endl;
-	DumpInHex(const_cast<char *>("Data start addr") ,aE32Image.iOrigHdr->iDataBase) << endl;
-	DumpInHex(const_cast<char *>("Text size") ,aE32Image.iOrigHdr->iTextSize) << endl;
-	DumpInHex(const_cast<char *>("Code size") ,aE32Image.iOrigHdr->iCodeSize) << endl;
-	DumpInHex(const_cast<char *>("Data size") ,aE32Image.iOrigHdr->iDataSize) << endl;
-	DumpInHex(const_cast<char *>("Bss size") ,aE32Image.iOrigHdr->iBssSize) << endl;
-	DumpInHex(const_cast<char *>("Total data size") ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl;
-	DumpInHex(const_cast<char *>("Heap min") ,aE32Image.iOrigHdr->iHeapSizeMin) << endl;
-	DumpInHex(const_cast<char *>("Heap max") ,aE32Image.iOrigHdr->iHeapSizeMax) << endl;
-	DumpInHex(const_cast<char *>("Stack size") ,aE32Image.iOrigHdr->iStackSize) << endl;
-	DumpInHex(const_cast<char *>("Export directory") ,aE32Image.iOrigHdr->iExportDirOffset) << endl;
-	DumpInHex(const_cast<char *>("Export dir count") ,aE32Image.iOrigHdr->iExportDirCount) << endl;
-	DumpInHex(const_cast<char *>("Flags") ,aE32Image.iOrigHdr->iFlags) << endl;
+	DumpInHex("Entry point", aE32Image.iOrigHdr->iEntryPoint ) << endl;
+	DumpInHex("Code start addr", aE32Image.iOrigHdr->iCodeBase)<< endl;
+	DumpInHex("Data start addr", aE32Image.iOrigHdr->iDataBase) << endl;
+	DumpInHex("Text size", aE32Image.iOrigHdr->iTextSize) << endl;
+	DumpInHex("Code size", aE32Image.iOrigHdr->iCodeSize) << endl;
+	DumpInHex("Data size", aE32Image.iOrigHdr->iDataSize) << endl;
+	DumpInHex("Bss size", aE32Image.iOrigHdr->iBssSize) << endl;
+	DumpInHex("Total data size", (aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl;
+	DumpInHex("Heap min", aE32Image.iOrigHdr->iHeapSizeMin) << endl;
+	DumpInHex("Heap max", aE32Image.iOrigHdr->iHeapSizeMax) << endl;
+	DumpInHex("Stack size", aE32Image.iOrigHdr->iStackSize) << endl;
+	DumpInHex("Export directory", aE32Image.iOrigHdr->iExportDirOffset) << endl;
+	DumpInHex("Export dir count", aE32Image.iOrigHdr->iExportDirCount) << endl;
+	DumpInHex("Flags", aE32Image.iOrigHdr->iFlags) << endl;
 
 	TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags);
 
@@ -105,10 +105,10 @@
 		// because this is relied on by used by "Symbian Signed".
 		//
 		E32ImageHeaderV* v = aE32Image.iHdr;
-		DumpInHex(const_cast<char *>("Secure ID"), v->iS.iSecureId) << endl;
-		DumpInHex(const_cast<char *>("Vendor ID"), v->iS.iVendorId) << endl;
-		DumpInHex(const_cast<char *>("Capability"), v->iS.iCaps[1]);
-		DumpInHex(const_cast<char *>(" "), v->iS.iCaps[0], aContinue) << endl;
+		DumpInHex("Secure ID", v->iS.iSecureId) << endl;
+		DumpInHex("Vendor ID", v->iS.iVendorId) << endl;
+		DumpInHex("Capability", v->iS.iCaps[1]);
+		DumpInHex(" ", v->iS.iCaps[0], aContinue) << endl;
 
 	}
 
@@ -119,17 +119,17 @@
 	*out << "(" << dec << aE32Image.iOrigHdr->iToolsVersion.iBuild << ")" << endl;
 
 	*out << "Module Version.............." << dec << (aE32Image.iOrigHdr->iModuleVersion >> 16) << endl;
-	DumpInHex(const_cast<char *>("Compression"), aE32Image.iOrigHdr->iCompressionType) << endl;
+	DumpInHex("Compression", aE32Image.iOrigHdr->iCompressionType) << endl;
 
 	if( aHeaderFmt >= KImageHdrFmt_V )
 	{
 		E32ImageHeaderV* v = aE32Image.iHdr;
-		DumpInHex(const_cast<char *>("Exception Descriptor"), v->iExceptionDescriptor) << endl;
-		DumpInHex(const_cast<char *>("Code offset"), v->iCodeOffset) << endl;
+		DumpInHex("Exception Descriptor", v->iExceptionDescriptor) << endl;
+		DumpInHex("Code offset", v->iCodeOffset) << endl;
 
 	}
 
 	*out << "Priority...................." << dec << aE32Image.iOrigHdr->iProcessPriority << endl;
-	DumpInHex(const_cast<char *>("Dll ref table size"), aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl;
+	DumpInHex("Dll ref table size", aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl;
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/src/image_handler.cpp
--- a/imgtools/romtools/readimage/src/image_handler.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/src/image_handler.cpp	Thu May 13 08:38:18 2010 +0100
@@ -392,8 +392,7 @@
 	{
 		if(iInputFileName.empty())
 		{
-			throw SisUtilsException(const_cast<char *>("Usage Error"),
-				const_cast<char *>("No SIS file passed"));
+			throw SisUtilsException("Usage Error","No SIS file passed");
 		}
 
 		iSisUtils = new Sis2Iby((char*)iInputFileName.c_str());
@@ -410,8 +409,7 @@
 		}
 		else
 		{
-			throw SisUtilsException(const_cast<char *>("Error:"),
-				const_cast<char *>("Cannot create Sis2Iby object"));
+			throw SisUtilsException("Error:","Cannot create Sis2Iby object");
 		}
 	}
 }
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/src/rofs_image_reader.cpp
--- a/imgtools/romtools/readimage/src/rofs_image_reader.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/src/rofs_image_reader.cpp	Thu May 13 08:38:18 2010 +0100
@@ -290,7 +290,7 @@
 
 			*out << "********************************************************************" << endl;
 			iPath.assign((char*)aNode->iName);	
-			GetCompleteNodePath(aNode,iPath,const_cast<char *>("/"));
+			GetCompleteNodePath(aNode,iPath,"/");
 			*out << "File........................" << iPath.c_str() << endl;
 			if( aNode->iEntry->iExecutable )
 			{
@@ -417,7 +417,7 @@
 	{
 		// get the complete path 
 		path.assign( (char*)aNode->iName );
-		GetCompleteNodePath( aNode, path, const_cast<char *>("\\\\") );
+		GetCompleteNodePath( aNode, path,"\\\\");
 
 	}
 	else
@@ -463,7 +463,7 @@
 @param aAppStr	- string to append.
 @return - returns full path of the given file.
 */
-void RofsImageReader::GetCompleteNodePath(TRomNode* aNode,string& aName,char* aAppStr)
+void RofsImageReader::GetCompleteNodePath(TRomNode* aNode,string& aName, char const* aAppStr)
 {
 	// check if the entry has a parent.
 	TRomNode* NodeParent = aNode->GetParent();
@@ -497,7 +497,7 @@
 	{
 		// get the complete path 
 		path.assign( (char*)aNode->iName );
-		GetCompleteNodePath( aNode, path, const_cast<char *>("\\") );
+		GetCompleteNodePath( aNode, path,"\\");
 	}
 	else
 	{
@@ -550,7 +550,7 @@
 				{
 					// get the complete path 
 					fileName.assign( (char*)currNode->iName );
-					GetCompleteNodePath( currNode, fileName, (char*)DIR_SEPARATOR );
+					GetCompleteNodePath( currNode, fileName,DIR_SEPARATOR );
 				}
 			}
 			else
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/readimage/src/rom_image_reader.cpp
--- a/imgtools/romtools/readimage/src/rom_image_reader.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/readimage/src/rom_image_reader.cpp	Thu May 13 08:38:18 2010 +0100
@@ -92,60 +92,60 @@
 
 	*out << endl << endl;
 
-	DumpInHex(const_cast<char *>("Timestamp"), (iRomHdr->iTime >> 32)) ;
-	DumpInHex(const_cast<char *>(" "), (iRomHdr->iTime &0xffffffff), aContinue) << endl;
+	DumpInHex("Timestamp", (iRomHdr->iTime >> 32)) ;
+	DumpInHex(" ", (iRomHdr->iTime &0xffffffff), aContinue) << endl;
 
-	DumpInHex(const_cast<char *>("RomBase"), iRomHdr->iRomBase) << endl;
+	DumpInHex("RomBase", iRomHdr->iRomBase) << endl;
 
-	DumpInHex(const_cast<char *>("RomSize"), iRomHdr->iRomSize) << endl;
-	DumpInHex(const_cast<char *>("KernelDataAddress"), iRomHdr->iKernDataAddress) << endl;
-	DumpInHex(const_cast<char *>("KernelLimit"), iRomHdr->iKernelLimit) << endl;
-	DumpInHex(const_cast<char *>("PrimaryFile"), iRomHdr->iPrimaryFile) << endl;
-	DumpInHex(const_cast<char *>("SecondaryFile"), iRomHdr->iSecondaryFile) << endl;
-	DumpInHex(const_cast<char *>("CheckSum"), iRomHdr->iCheckSum) << endl;
-	DumpInHex(const_cast<char *>("Hardware"), iRomHdr->iHardware) << endl;
+	DumpInHex("RomSize", iRomHdr->iRomSize) << endl;
+	DumpInHex("KernelDataAddress", iRomHdr->iKernDataAddress) << endl;
+	DumpInHex("KernelLimit", iRomHdr->iKernelLimit) << endl;
+	DumpInHex("PrimaryFile", iRomHdr->iPrimaryFile) << endl;
+	DumpInHex("SecondaryFile", iRomHdr->iSecondaryFile) << endl;
+	DumpInHex("CheckSum", iRomHdr->iCheckSum) << endl;
+	DumpInHex("Hardware", iRomHdr->iHardware) << endl;
 
-	DumpInHex(const_cast<char *>("Language"), (TUint)(iRomHdr->iLanguage >> 32));
-	DumpInHex(const_cast<char *>(" "), ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl;
+	DumpInHex("Language", (TUint)(iRomHdr->iLanguage >> 32));
+	DumpInHex(" ", ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl;
 
-	DumpInHex(const_cast<char *>("KernelConfigFlags"), iRomHdr->iKernelConfigFlags) << endl;
-	DumpInHex(const_cast<char *>("RomExceptionSearchTable"), iRomHdr->iRomExceptionSearchTable) << endl;
-	DumpInHex(const_cast<char *>("RomHeaderSize"), iRomHdr->iRomHeaderSize) << endl;
-	DumpInHex(const_cast<char *>("RomSectionHeader"), iRomHdr->iRomSectionHeader) << endl;
-	DumpInHex(const_cast<char *>("TotalSvDataSize"), iRomHdr->iTotalSvDataSize) << endl;
-	DumpInHex(const_cast<char *>("VariantFile"), iRomHdr->iVariantFile) << endl;
-	DumpInHex(const_cast<char *>("ExtensionFile"), iRomHdr->iExtensionFile) << endl;
-	DumpInHex(const_cast<char *>("RelocInfo"), iRomHdr->iRelocInfo) << endl;
-	DumpInHex(const_cast<char *>("OldTraceMask"), iRomHdr->iOldTraceMask) << endl;
-	DumpInHex(const_cast<char *>("UserDataAddress"), iRomHdr->iUserDataAddress) << endl;
-	DumpInHex(const_cast<char *>("TotalUserDataSize"), iRomHdr->iTotalUserDataSize) << endl;
-	DumpInHex(const_cast<char *>("DebugPort"), iRomHdr->iDebugPort) << endl;
+	DumpInHex("KernelConfigFlags", iRomHdr->iKernelConfigFlags) << endl;
+	DumpInHex("RomExceptionSearchTable", iRomHdr->iRomExceptionSearchTable) << endl;
+	DumpInHex("RomHeaderSize", iRomHdr->iRomHeaderSize) << endl;
+	DumpInHex("RomSectionHeader", iRomHdr->iRomSectionHeader) << endl;
+	DumpInHex("TotalSvDataSize", iRomHdr->iTotalSvDataSize) << endl;
+	DumpInHex("VariantFile", iRomHdr->iVariantFile) << endl;
+	DumpInHex("ExtensionFile", iRomHdr->iExtensionFile) << endl;
+	DumpInHex("RelocInfo", iRomHdr->iRelocInfo) << endl;
+	DumpInHex("OldTraceMask", iRomHdr->iOldTraceMask) << endl;
+	DumpInHex("UserDataAddress", iRomHdr->iUserDataAddress) << endl;
+	DumpInHex("TotalUserDataSize", iRomHdr->iTotalUserDataSize) << endl;
+	DumpInHex("DebugPort", iRomHdr->iDebugPort) << endl;
 	
-	DumpInHex(const_cast<char *>("Version"), iRomHdr->iVersion.iMajor, false, 2);
-	DumpInHex(const_cast<char *>("."), iRomHdr->iVersion.iMinor, aContinue, 2);
-	DumpInHex(const_cast<char *>("(") ,iRomHdr->iVersion.iBuild, aContinue, 2);
+	DumpInHex("Version", iRomHdr->iVersion.iMajor, false, 2);
+	DumpInHex(".", iRomHdr->iVersion.iMinor, aContinue, 2);
+	DumpInHex("(" ,iRomHdr->iVersion.iBuild, aContinue, 2);
 	*out << ")" << endl;
 
-	DumpInHex(const_cast<char *>("CompressionType"), iRomHdr->iCompressionType) << endl;
-	DumpInHex(const_cast<char *>("CompressedSize"), iRomHdr->iCompressedSize) << endl;
-	DumpInHex(const_cast<char *>("UncompressedSize"), iRomHdr->iUncompressedSize) << endl;
-	DumpInHex(const_cast<char *>("HcrFileAddress"), iRomHdr->iHcrFileAddress) << endl;
+	DumpInHex("CompressionType", iRomHdr->iCompressionType) << endl;
+	DumpInHex("CompressedSize", iRomHdr->iCompressedSize) << endl;
+	DumpInHex("UncompressedSize", iRomHdr->iUncompressedSize) << endl;
+	DumpInHex("HcrFileAddress", iRomHdr->iHcrFileAddress) << endl;
 	
-	DumpInHex(const_cast<char *>("DisabledCapabilities"), iRomHdr->iDisabledCapabilities[0]);
-	DumpInHex(const_cast<char *>(" "), iRomHdr->iDisabledCapabilities[1], aContinue) << endl;
+	DumpInHex("DisabledCapabilities", iRomHdr->iDisabledCapabilities[0]);
+	DumpInHex(" ", iRomHdr->iDisabledCapabilities[1], aContinue) << endl;
 
-	DumpInHex(const_cast<char *>("TraceMask"), iRomHdr->iTraceMask[0]);
+	DumpInHex("TraceMask", iRomHdr->iTraceMask[0]);
 
 	aPos = 1;
 	while( aPos < (TUint)KNumTraceMaskWords)
 	{
 		if(iRomHdr->iTraceMask[aPos])
 		{
-			DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue);
+			DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue);
 		}
 		else
 		{
-			DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue, 1);
+			DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue, 1);
 		}
 
 	}
@@ -158,22 +158,22 @@
 	*out << "Extension ROM Image" << endl << endl;
 	bool aContinue = true;
 
-	DumpInHex(const_cast<char *>("Timestamp"), (iExtRomHdr->iTime >> 32)) ;
-	DumpInHex(const_cast<char *>(" "), (iExtRomHdr->iTime &0xffffffff), aContinue) << endl;
+	DumpInHex("Timestamp", (iExtRomHdr->iTime >> 32)) ;
+	DumpInHex(" ", (iExtRomHdr->iTime &0xffffffff), aContinue) << endl;
 
-	DumpInHex(const_cast<char *>("RomBase"), iExtRomHdr->iRomBase) << endl;
+	DumpInHex("RomBase", iExtRomHdr->iRomBase) << endl;
 
-	DumpInHex(const_cast<char *>("RomSize"), iExtRomHdr->iRomSize) << endl;
-	DumpInHex(const_cast<char *>("CheckSum"), iExtRomHdr->iCheckSum) << endl;
+	DumpInHex("RomSize", iExtRomHdr->iRomSize) << endl;
+	DumpInHex("CheckSum", iExtRomHdr->iCheckSum) << endl;
 	
-	DumpInHex(const_cast<char *>("Version"), iExtRomHdr->iVersion.iMajor, false, 2);
-	DumpInHex(const_cast<char *>("."), iExtRomHdr->iVersion.iMinor, aContinue, 2);
-	DumpInHex(const_cast<char *>("(") ,iExtRomHdr->iVersion.iBuild, aContinue, 2);
+	DumpInHex("Version", iExtRomHdr->iVersion.iMajor, false, 2);
+	DumpInHex(".", iExtRomHdr->iVersion.iMinor, aContinue, 2);
+	DumpInHex("(" ,iExtRomHdr->iVersion.iBuild, aContinue, 2);
 	*out << ")" << endl;
 
-	DumpInHex(const_cast<char *>("CompressionType"), iExtRomHdr->iCompressionType) << endl;
-	DumpInHex(const_cast<char *>("CompressedSize"), iExtRomHdr->iCompressedSize) << endl;
-	DumpInHex(const_cast<char *>("UncompressedSize"), iExtRomHdr->iUncompressedSize) << endl;
+	DumpInHex("CompressionType", iExtRomHdr->iCompressionType) << endl;
+	DumpInHex("CompressedSize", iExtRomHdr->iCompressedSize) << endl;
+	DumpInHex("UncompressedSize", iExtRomHdr->iUncompressedSize) << endl;
 	
 	*out << endl << endl;
 
@@ -583,31 +583,31 @@
 {
 	bool aContinue = true;
 
-	DumpInHex(const_cast<char *>("Load Address"), aEntry->iTRomEntryPtr->iAddressLin) << endl;
-	DumpInHex(const_cast<char *>("Size"), aEntry->iTRomEntryPtr->iSize) << endl;
+	DumpInHex("Load Address", aEntry->iTRomEntryPtr->iAddressLin) << endl;
+	DumpInHex("Size", aEntry->iTRomEntryPtr->iSize) << endl;
 
 	TRomImageHeader		*aRomImgEntry = aEntry->ImagePtr.iRomFileEntry;
 
 	if( !aRomImgEntry )
 		return;
 	//UIDs
-	DumpInHex(const_cast<char *>("Uids"), aRomImgEntry->iUid1);
-	DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid2, aContinue);
-	DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid3, aContinue);
-	DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUidChecksum, aContinue) << endl;
+	DumpInHex("Uids", aRomImgEntry->iUid1);
+	DumpInHex(" ", aRomImgEntry->iUid2, aContinue);
+	DumpInHex(" ", aRomImgEntry->iUid3, aContinue);
+	DumpInHex(" ", aRomImgEntry->iUidChecksum, aContinue) << endl;
 
-	DumpInHex(const_cast<char *>("Entry point"), aRomImgEntry->iEntryPoint) << endl;
-	DumpInHex(const_cast<char *>("Code start addr"), aRomImgEntry->iCodeAddress) << endl;
-	DumpInHex(const_cast<char *>("Data start addr"), aRomImgEntry->iDataAddress) << endl;
-	DumpInHex(const_cast<char *>("DataBssLinearBase"), aRomImgEntry->iDataBssLinearBase) << endl;
-	DumpInHex(const_cast<char *>("Text size"), aRomImgEntry->iTextSize) << endl;
-	DumpInHex(const_cast<char *>("Code size"), aRomImgEntry->iCodeSize) << endl;
-	DumpInHex(const_cast<char *>("Data size"), aRomImgEntry->iDataSize) << endl;
-	DumpInHex(const_cast<char *>("Bss size"), (aRomImgEntry->iBssSize)) << endl;
-	DumpInHex(const_cast<char *>("Total data size"), aRomImgEntry->iTotalDataSize) << endl;
-	DumpInHex(const_cast<char *>("Heap min"), aRomImgEntry->iHeapSizeMin) << endl;
-	DumpInHex(const_cast<char *>("Heap max"), aRomImgEntry->iHeapSizeMax) << endl;
-	DumpInHex(const_cast<char *>("Stack size"), aRomImgEntry->iStackSize) << endl;
+	DumpInHex("Entry point", aRomImgEntry->iEntryPoint) << endl;
+	DumpInHex("Code start addr", aRomImgEntry->iCodeAddress) << endl;
+	DumpInHex("Data start addr", aRomImgEntry->iDataAddress) << endl;
+	DumpInHex("DataBssLinearBase", aRomImgEntry->iDataBssLinearBase) << endl;
+	DumpInHex("Text size", aRomImgEntry->iTextSize) << endl;
+	DumpInHex("Code size", aRomImgEntry->iCodeSize) << endl;
+	DumpInHex("Data size", aRomImgEntry->iDataSize) << endl;
+	DumpInHex("Bss size", (aRomImgEntry->iBssSize)) << endl;
+	DumpInHex("Total data size", aRomImgEntry->iTotalDataSize) << endl;
+	DumpInHex("Heap min", aRomImgEntry->iHeapSizeMin) << endl;
+	DumpInHex("Heap max", aRomImgEntry->iHeapSizeMax) << endl;
+	DumpInHex("Stack size", aRomImgEntry->iStackSize) << endl;
 
 	TDllRefTable *aRefTbl = NULL;
 
@@ -615,18 +615,18 @@
 		TUint32 aOff = (TUint32)aRomImgEntry->iDllRefTable - iImageHeader->iRomHdr->iRomBase;
 		aRefTbl = (TDllRefTable*) ((char*)iImageHeader->iRomHdr + aOff);
 		TUint32 aVirtualAddr = (TUint32)aRefTbl->iEntry[0];
-		DumpInHex(const_cast<char *>("Dll ref table"), aVirtualAddr) << endl;
+		DumpInHex("Dll ref table", aVirtualAddr) << endl;
 	}
 
-	DumpInHex(const_cast<char *>("Export directory"), aRomImgEntry->iExportDir) << endl;
-	DumpInHex(const_cast<char *>("Export dir count"), aRomImgEntry->iExportDirCount) << endl;
-	DumpInHex(const_cast<char *>("Hardware variant"), aRomImgEntry->iHardwareVariant) << endl;
-	DumpInHex(const_cast<char *>("Flags"), aRomImgEntry->iFlags) << endl;
-	DumpInHex(const_cast<char *>("Secure ID"), aRomImgEntry->iS.iSecureId) << endl;
-	DumpInHex(const_cast<char *>("Vendor ID"), aRomImgEntry->iS.iVendorId) << endl;
+	DumpInHex("Export directory", aRomImgEntry->iExportDir) << endl;
+	DumpInHex("Export dir count", aRomImgEntry->iExportDirCount) << endl;
+	DumpInHex("Hardware variant", aRomImgEntry->iHardwareVariant) << endl;
+	DumpInHex("Flags", aRomImgEntry->iFlags) << endl;
+	DumpInHex("Secure ID", aRomImgEntry->iS.iSecureId) << endl;
+	DumpInHex("Vendor ID", aRomImgEntry->iS.iVendorId) << endl;
 
-	DumpInHex(const_cast<char *>("Capability"), aRomImgEntry->iS.iCaps[1]);
-	DumpInHex(const_cast<char *>(" "), aRomImgEntry->iS.iCaps[0], aContinue) << endl;
+	DumpInHex("Capability", aRomImgEntry->iS.iCaps[1]);
+	DumpInHex(" ", aRomImgEntry->iS.iCaps[0], aContinue) << endl;
 	
 	*out << "Tools Version..............." << dec << (TUint)aRomImgEntry->iToolsVersion.iMajor;
 	*out << "." ; 
@@ -637,13 +637,13 @@
 	*out << endl;
 
 	*out << "Module Version.............." << dec << (aRomImgEntry->iModuleVersion >> 16) << endl;
-	DumpInHex(const_cast<char *>("Exception Descriptor"), aRomImgEntry->iExceptionDescriptor) << endl;
+	DumpInHex("Exception Descriptor", aRomImgEntry->iExceptionDescriptor) << endl;
 	*out << "Priority...................." << dec << aRomImgEntry->iPriority << endl;
 
 	if( aRefTbl )
-		DumpInHex(const_cast<char *>("Dll ref table size"), aRefTbl->iNumberOfEntries*8) << endl;
+		DumpInHex("Dll ref table size", aRefTbl->iNumberOfEntries*8) << endl;
 	else
-		DumpInHex(const_cast<char *>("Dll ref table size"), 0) << endl;
+		DumpInHex("Dll ref table size", 0) << endl;
 
 	if( iDisplayOptions & DUMP_E32_IMG_FLAG){
 		if(stricmp(iE32ImgFileName.c_str(), aEntry->Name()) == 0){
@@ -702,8 +702,8 @@
 	*out << left << prefix;
 	out->width(40);	
 	*out << right << file->Name() << "[" ;
-	DumpInHex( const_cast<char *>(""), aRomImgEntry->iHardwareVariant, true) << "] ";
-	DumpInHex( const_cast<char *>(" DataSize="), (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;
+	DumpInHex("", aRomImgEntry->iHardwareVariant, true) << "] ";
+	DumpInHex(" DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;
 	
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/rofsbuild/r_coreimage.cpp
--- a/imgtools/romtools/rofsbuild/r_coreimage.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/rofsbuild/r_coreimage.cpp	Thu May 13 08:38:18 2010 +0100
@@ -99,7 +99,7 @@
 TInt RCoreImageReader::ReadIdentifier()
 	{
 	int itemsRead = fread(&iIdentifier, sizeof(TUint8), K_ID_SIZE, iCoreImage);
-	TInt result = ImageError(itemsRead,  K_ID_SIZE, const_cast<char *>("Read Identifier"));
+	TInt result = ImageError(itemsRead,  K_ID_SIZE, "Read Identifier");
 	if (result != KErrNone)
 		{
 		iIdentifier[0] = 0;
@@ -117,7 +117,7 @@
 	{
 	int itemsRead = fread (&aHeader.iHeaderSize, 
 			(sizeof(TRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage);
-	TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Core Header"));
+	TInt result = ImageError(itemsRead, 1, "Read Core Header");
 	if (result == KErrNone)
 		{
 		// copy the previously read identifier into the header
@@ -137,7 +137,7 @@
 	{
 	int itemsRead = fread (&aHeader.iHeaderSize, 
 			(sizeof(TExtensionRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage);
-	TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Extension Header"));
+	TInt result = ImageError(itemsRead, 1, "Read Extension Header");
 	if (result == KErrNone)
 		{
 		// copy the previously read identifier into the header
@@ -199,7 +199,7 @@
 	// is read later when handling subdirectories
 	int bytesRead = sizeof(TRofsDir) - sizeof(TRofsEntry);
 	int itemsRead = fread (&aDir, bytesRead , 1, iCoreImage);
-	if (ImageError(itemsRead, 1, const_cast<char *>("Read Dir")) == KErrNone)
+	if (ImageError(itemsRead, 1, "Read Dir") == KErrNone)
 		return bytesRead;
 	else
 		return 0;
@@ -233,13 +233,13 @@
 	// need to work out how big entry needs to be from the Struct Size
 	// in TRofsEntry
 	int itemsRead = fread(&aEntry.iStructSize, sizeof(TUint16), 1, iCoreImage);
-	int result = ImageError(itemsRead, 1, const_cast<char *>("Read Entry Size"));
+	int result = ImageError(itemsRead, 1, "Read Entry Size");
 	if (result == KErrNone)
 		{
 		// read rest of entry excluding the iStructSize
 		itemsRead = fread(&aEntry.iUids[0], sizeof(TRofsEntry) -sizeof(TUint16), 
 				          1, iCoreImage);
-		result = ImageError(itemsRead, 1, const_cast<char *>("Rest of Entry"));
+		result = ImageError(itemsRead, 1, "Rest of Entry");
 		// return length read - this include includes iStructSize and first char of name
 		if (result == KErrNone)
 			return sizeof(TRofsEntry);	
@@ -270,7 +270,7 @@
 TInt RCoreImageReader::ReadRofEntryName(TUint16* aName, int aLength)
 	{
 	int itemsRead = fread(aName, sizeof(TUint16), aLength, iCoreImage);
-	return ImageError(itemsRead, aLength, const_cast<char *>("Rof Entry Name"));
+	return ImageError(itemsRead, aLength, "Rof Entry Name");
 	}
 
 /**
@@ -305,7 +305,7 @@
 @param aInfo Used by the caller to identify where the error occurred.
 @return Error number. KErrNone is returned if there are no errors.
 */
-TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char *aInfo)
+TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char const *aInfo)
 	{
 	if (aItemsRead != aExpected)
 		{
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/rofsbuild/r_coreimage.h
--- a/imgtools/romtools/rofsbuild/r_coreimage.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/rofsbuild/r_coreimage.h	Thu May 13 08:38:18 2010 +0100
@@ -103,7 +103,7 @@
 	TText* Filename();
 private:
 	TInt ReadIdentifier();
-	TInt ImageError(int aBytesRead, int aExpected, char* aInfo);
+	TInt ImageError(int aBytesRead, int aExpected, char const* aInfo);
 
 	/** Image type of the file being read */
 	TImageType iImageType;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/rombuild/r_areaset.cpp
--- a/imgtools/romtools/rombuild/r_areaset.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/rombuild/r_areaset.cpp	Thu May 13 08:38:18 2010 +0100
@@ -47,7 +47,7 @@
 Area::~Area()
 	{
 	ReleaseAllFiles();
-	free(const_cast<char*>(iName));	// allocated with strdup()
+	free(iName);	// allocated with strdup()
 	}
 
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/romtools/rombuild/r_areaset.h
--- a/imgtools/romtools/rombuild/r_areaset.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/romtools/rombuild/r_areaset.h	Thu May 13 08:38:18 2010 +0100
@@ -104,7 +104,7 @@
 public:
 	TRomBuilderEntry* iFirstPagedCode; // For PagedRom only
 private:
-	const char* iName;
+	char* iName;
 	TLinAddr iDestBaseAddr;
 	TLinAddr iSrcBaseAddr;
 	TLinAddr iSrcLimitAddr;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/inc/pkgfileparser.h
--- a/imgtools/sisutils/inc/pkgfileparser.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/inc/pkgfileparser.h	Thu May 13 08:38:18 2010 +0100
@@ -197,7 +197,7 @@
 	VARIANTVAL m_tokenValue;
 	int m_nLineNo;
 
-	void ParserError(char* msg);
+	void ParserError(char const* msg);
 
 	friend String wstring2string (const std::wstring& aWide);
 	friend std::wstring string2wstring (const String& aNarrow);
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/inc/sis2iby.h
--- a/imgtools/sisutils/inc/sis2iby.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/inc/sis2iby.h	Thu May 13 08:38:18 2010 +0100
@@ -38,7 +38,7 @@
 class Sis2Iby : public SisUtils
 {
 public:
-	Sis2Iby(char* aFile);
+	Sis2Iby(char const* aFile);
 	~Sis2Iby();
 
 	void ProcessSisFile();
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/inc/sisutils.h
--- a/imgtools/sisutils/inc/sisutils.h	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/inc/sisutils.h	Thu May 13 08:38:18 2010 +0100
@@ -56,7 +56,7 @@
 class SisUtils
 {
 public:
-	SisUtils(char* aFile);
+	SisUtils(char const* aFile);
 	virtual ~SisUtils();
 
 	void SetVerboseMode();
@@ -84,7 +84,7 @@
 class SisUtilsException
 {
 public:
-	SisUtilsException(char* aFile, char* aErrMessage);
+	SisUtilsException(char const* aFile, char const* aErrMessage);
 	virtual ~SisUtilsException();
 	virtual void Report();
 
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/src/pkgfileparser.cpp
--- a/imgtools/sisutils/src/pkgfileparser.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/src/pkgfileparser.cpp	Thu May 13 08:38:18 2010 +0100
@@ -175,7 +175,7 @@
 {
 	if(!OpenFile())
 	{
-		throw SisUtilsException((char*)iPkgFile.data(), const_cast<char *>("Could not open file"));
+		throw SisUtilsException(iPkgFile.c_str(),"Could not open file");
 	}
 
 	GetNextChar();
@@ -220,7 +220,7 @@
 		case EOF_TOKEN:
 			break;
 		default:
-			ParserError(const_cast<char *>("Unexpected token"));
+			ParserError("Unexpected token");
 			break;
 		}
 	}
@@ -675,7 +675,7 @@
 				aExpression.append("\"");
 				break;
 			case ALPHA_TOKEN:
-                if(!CompareNString(m_tokenValue.pszString,const_cast<wchar_t *>(L"option"),6))
+                if(!CompareNString(m_tokenValue.pszString,L"option",6))
 				{
 					aExpression.append(" defined(");
 					aExpression.append(wstring2string(m_tokenValue.pszString));
@@ -698,7 +698,7 @@
 		}
 		break;
 	default:
-		ParserError(const_cast<char *>("ErrBadCondFormat"));
+		ParserError("ErrBadCondFormat");
 	}
 	GetNextToken ();
 }
@@ -1017,7 +1017,7 @@
 {
 	if (m_token!=aToken)
 	{
-		ParserError(const_cast<char *>("Unexpected Token"));
+		ParserError("Unexpected Token");
 	}
 }
 
@@ -1125,11 +1125,11 @@
 				if(wCount < (MAX_STRING - 1))
 					m_tokenValue.pszString[wCount++] = m_pkgChar;
 				else //We dont want the string with length greater than MAX_STRING to be cut off silently
-					ParserError(const_cast<char *>("Bad String"));
+					ParserError("Bad String");
 				GetNextChar();
 			}
 			if(m_pkgChar == '\0')
-				ParserError(const_cast<char *>("Bad String"));
+				ParserError("Bad String");
 			GetNextChar();
 			done=true;
 		}
@@ -1188,7 +1188,7 @@
 		}
 		unsigned num=m_tokenValue.dwNumber;
 		// watch for CP1252 escapes which aren't appropriate for UNICODE
-		if (num>=0x80 && num<=0x9F) ParserError(const_cast<char *>("Invalid Escape"));
+		if (num>=0x80 && num<=0x9F) ParserError("Invalid Escape");
 		unsigned len=wcslen(temp);
 		wcscpy(m_tokenValue.pszString,temp);
 		if (len+2<=MAX_STRING)
@@ -1265,17 +1265,17 @@
 	unsigned wchRead = fread(&temp[1],sizeof(wchar_t),MAX_STRING - 2,iPkgHandle);
 	if (!wchRead)
 	{ 
-		ParserError(const_cast<char *>("Read failed"));
+		ParserError("Read failed");
 	}
 	temp[1+wchRead] = 0;
-	hexString = (!CompareNString(temp, const_cast<wchar_t *>(L"0x"), 2) ||
-		!CompareNString(&temp[1], const_cast<wchar_t *>(L"0x"), 2));
+	hexString = (!CompareNString(temp,L"0x", 2) ||
+		!CompareNString(&temp[1],L"0x", 2));
 	
 	m_tokenValue.dwNumber = wcstoul(temp, &end, (hexString) ? 16 : 10);
 	
 	if (end==temp)
 	{
-		ParserError(const_cast<char *>("Read failed"));
+		ParserError("Read failed");
 	}
 	std::fsetpos(iPkgHandle,&foff);
 	std::fseek(iPkgHandle,(end-temp-1) * sizeof(wchar_t),SEEK_CUR);		
@@ -1349,13 +1349,13 @@
 
 @param msg - error message to be thrown
 */
-void PkgParser::ParserError(char* msg)
+void PkgParser::ParserError(char const* msg)
 {
 	std::ostringstream str;
 
 	str << (char*)iPkgFile.data() << "(" << m_nLineNo << "): " << msg;
 
-	throw SisUtilsException(const_cast<char *>("PackageFile-Parser Error"), (char*)(str.str()).data());
+	throw SisUtilsException("PackageFile-Parser Error",str.str().c_str());
 }
 
 /**
@@ -1372,8 +1372,7 @@
 	size_t nchars = wcstombs(&buffer[0],aWide.c_str(),buffer.size());
 	if (nchars == (size_t)-1)
 	{
-		throw SisUtilsException(const_cast<char *>("ParserError"),
-			const_cast<char *>("wstring to string conversion failed"));
+		throw SisUtilsException("ParserError","wstring to string conversion failed");
 	}
 	String reply(&buffer[0]);
 	return reply;
@@ -1393,8 +1392,7 @@
 	size_t nchars = mbstowcs((wchar_t *)&buffer[0],aNarrow.c_str(),buffer.size());
 	if (nchars == (size_t)-1)
 	{
-		throw SisUtilsException(const_cast<char *>("ParserError"),
-			const_cast<char *>("string to wstring conversion failed"));
+		throw SisUtilsException("ParserError","string to wstring conversion failed");
 	}
 	std::wstring reply((wchar_t *)&buffer[0]);
 	return reply;
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/src/sis2iby.cpp
--- a/imgtools/sisutils/src/sis2iby.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/src/sis2iby.cpp	Thu May 13 08:38:18 2010 +0100
@@ -28,7 +28,7 @@
 
 @param aFile	- SIS file name
 */
-Sis2Iby::Sis2Iby(char* aFile) : SisUtils(aFile)
+Sis2Iby::Sis2Iby(char const* aFile) : SisUtils(aFile)
 {
 }
 
@@ -70,7 +70,7 @@
 
 	if(IsVerboseMode())
 	{
-		std::cout << "Processing " << (char*)sisFile.data() << std::endl;
+		std::cout << "Processing " << sisFile.c_str() << std::endl;
 	}
 
 	if(IsFileExist(sisFile))
@@ -86,12 +86,12 @@
 			break;
 		case STAT_FAILURE:
 			{
-				throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("Failed to extract SIS file"));
+				throw SisUtilsException(sisFile.c_str(),"Failed to extract SIS file");
 			}
 		}
 	}
 	else
-		throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("File not found"));
+		throw SisUtilsException(sisFile.c_str(),"File not found");
 }
 
 /**
@@ -128,18 +128,18 @@
 	ibyFile.append(".iby");
 
 	if( !MakeDirectory(iOutputPath) )
-		throw SisUtilsException((char*)iOutputPath.data(), const_cast<char *>("Failed to create path"));
+		throw SisUtilsException(iOutputPath.c_str(),"Failed to create path");
 
 	if(IsVerboseMode())
 	{
-		std::cout << "Generating IBY file " << (char*)ibyFile.data() << std::endl;
+		std::cout << "Generating IBY file " << ibyFile.c_str() << std::endl;
 	}
 
 	ibyHandle.open((char*)ibyFile.data(),(std::ios::out));
 
 	if(!ibyHandle.good())
 	{
-		throw SisUtilsException((char*)ibyFile.data(), const_cast<char *>("Failed to create IBY file"));
+		throw SisUtilsException(ibyFile.c_str(),"Failed to create IBY file");
 	}
 
 	// Generating Header
@@ -239,11 +239,10 @@
 			}
 		}
 		else
-			throw SisUtilsException((char*)pkgFileName.data(), const_cast<char *>("Could not create parser object"));
+			throw SisUtilsException(pkgFileName.c_str(),"Could not create parser object");
 	}
 	else
-		throw SisUtilsException(const_cast<char *>(pkgFileName.data()),
-			const_cast<char *>("File not found"));
+		throw SisUtilsException(pkgFileName.c_str(),"File not found");
 }
 
 /**
@@ -658,8 +657,7 @@
 
 	if( !aIfs.is_open() )
 	{
-		throw SisUtilsException(const_cast<char *>(aFile.data()),
-			const_cast<char *>("Cannot open file"));
+		throw SisUtilsException(aFile.c_str(),"Cannot open file");
 	}
 
 	aIfs.seekg(0,std::ios::end);
diff -r 301c3edbdaa1 -r 787612182dd0 imgtools/sisutils/src/sisutils.cpp
--- a/imgtools/sisutils/src/sisutils.cpp	Wed May 12 09:52:26 2010 +0100
+++ b/imgtools/sisutils/src/sisutils.cpp	Thu May 13 08:38:18 2010 +0100
@@ -40,7 +40,7 @@
 @param aFile	- Name of the file
 @param aErrMessage - Error message
 */
-SisUtilsException::SisUtilsException(char* aFile, char* aErrMessage) : \
+SisUtilsException::SisUtilsException(char const* aFile, char const* aErrMessage) : \
 	iSisFileName(aFile), iErrMessage(aErrMessage)
 {
 }
@@ -79,7 +79,7 @@
 
 @param aFile	- Name of the SIS file
 */
-SisUtils::SisUtils(char* aFile) :  iVerboseMode(EFalse),iSisFile(aFile)
+SisUtils::SisUtils(char const* aFile) :  iVerboseMode(EFalse),iSisFile(aFile)
 {
 }
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/UserDict.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/UserDict.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/_abcoll.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/_abcoll.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/abc.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/abc.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/atexit.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/atexit.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/codecs.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/codecs.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/collections.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/collections.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/copy.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/copy.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/copy_reg.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/copy_reg.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/archive_util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/archive_util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/ccompiler.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/ccompiler.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/cmd.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/cmd.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build_ext.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build_ext.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build_scripts.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/build_scripts.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_egg_info.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_egg_info.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_lib.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_lib.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_scripts.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/command/install_scripts.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/config.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/config.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/core.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/core.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/debug.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/debug.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dep_util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dep_util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dir_util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dir_util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dist.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/dist.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/errors.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/errors.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/extension.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/extension.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/fancy_getopt.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/fancy_getopt.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/file_util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/file_util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/log.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/log.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/spawn.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/spawn.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/sysconfig.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/sysconfig.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/text_file.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/text_file.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/unixccompiler.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/unixccompiler.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/distutils/util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/aliases.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/aliases.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/utf_8.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/encodings/utf_8.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/fnmatch.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/fnmatch.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/functools.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/functools.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/genericpath.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/genericpath.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/getopt.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/getopt.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/gettext.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/gettext.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/glob.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/glob.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/keyword.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/keyword.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/linecache.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/linecache.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/locale.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/locale.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/process.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/process.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/util.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/multiprocessing/util.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/optparse.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/optparse.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/os.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/os.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/platform.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/platform.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/posixpath.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/posixpath.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/re.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/re.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/site.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/site.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_compile.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_compile.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_constants.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_constants.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_parse.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/sre_parse.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/stat.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/stat.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/string.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/string.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/struct.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/struct.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/textwrap.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/textwrap.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/threading.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/threading.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/traceback.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/traceback.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/types.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/types.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/warnings.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/warnings.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/weakref.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/weakref.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/ElementPath.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/ElementPath.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/ElementTree.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/ElementTree.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/__init__.pyc
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Lib/xml/etree/__init__.pyc has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -78,7 +78,7 @@
 MACHDEP=	linux2
 
 # Install prefix for architecture-independent files
-prefix=		/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262
+prefix=		/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262
 
 # Install prefix for architecture-dependent files
 exec_prefix=	${prefix}
@@ -127,7 +127,7 @@
 OTHER_LIBTOOL_OPT=
 
 # Environment to run shared python without installed libraries
-RUNSHARED=       LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:
+RUNSHARED=       LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:
 
 # Modes for directories, executables and data files created by the
 # install process.  Default to user-only-writable for all file types.
@@ -136,7 +136,7 @@
 FILEMODE=	644
 
 # configure script arguments
-CONFIG_ARGS=	 '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'
+CONFIG_ARGS=	 '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'
 
 
 # Subdirectories with code
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile.pre
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile.pre	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Makefile.pre	Thu May 13 08:38:18 2010 +0100
@@ -77,7 +77,7 @@
 MACHDEP=	linux2
 
 # Install prefix for architecture-independent files
-prefix=		/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262
+prefix=		/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262
 
 # Install prefix for architecture-dependent files
 exec_prefix=	${prefix}
@@ -126,7 +126,7 @@
 OTHER_LIBTOOL_OPT=
 
 # Environment to run shared python without installed libraries
-RUNSHARED=       LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:
+RUNSHARED=       LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:
 
 # Modes for directories, executables and data files created by the
 # install process.  Default to user-only-writable for all file types.
@@ -135,7 +135,7 @@
 FILEMODE=	644
 
 # configure script arguments
-CONFIG_ARGS=	 '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'
+CONFIG_ARGS=	 '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'
 
 
 # Subdirectories with code
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Parser/pgen
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Parser/pgen has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_bisect.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_bisect.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_bytesio.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_bytesio.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_cn.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_cn.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_hk.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_hk.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_iso2022.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_iso2022.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_jp.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_jp.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_kr.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_kr.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_tw.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_codecs_tw.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_collections.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_collections.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_csv.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_csv.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_ctypes.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_ctypes.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_ctypes_test.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_ctypes_test.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_curses.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_curses.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_curses_panel.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_curses_panel.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_elementtree.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_elementtree.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_fileio.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_fileio.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_functools.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_functools.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_heapq.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_heapq.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_hotshot.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_hotshot.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_json.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_json.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_locale.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_locale.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_lsprof.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_lsprof.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_md5.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_md5.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_multibytecodec.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_multibytecodec.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_multiprocessing.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_multiprocessing.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_random.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_random.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha256.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha256.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha512.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_sha512.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_socket.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_socket.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_struct.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_struct.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_testcapi.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_testcapi.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_weakref.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/_weakref.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/array.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/array.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/audioop.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/audioop.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/binascii.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/binascii.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cPickle.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cPickle.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cStringIO.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cStringIO.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cmath.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/cmath.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/crypt.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/crypt.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/datetime.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/datetime.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/dl.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/dl.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/fcntl.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/fcntl.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/future_builtins.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/future_builtins.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/grp.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/grp.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/imageop.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/imageop.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/itertools.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/itertools.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/linuxaudiodev.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/linuxaudiodev.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/math.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/math.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/mmap.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/mmap.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/nis.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/nis.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/operator.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/operator.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/ossaudiodev.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/ossaudiodev.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/parser.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/parser.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/pyexpat.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/pyexpat.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/resource.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/resource.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/select.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/select.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/spwd.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/spwd.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/strop.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/strop.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/syslog.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/syslog.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/termios.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/termios.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/time.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/time.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/unicodedata.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/unicodedata.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/zlib.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/lib.linux-i686-2.6/zlib.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/2to3
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/2to3	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/2to3	Thu May 13 08:38:18 2010 +0100
@@ -1,4 +1,4 @@
-#!/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
+#!/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
 from lib2to3.main import main
 import sys
 import os
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/idle
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/idle	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/idle	Thu May 13 08:38:18 2010 +0100
@@ -1,4 +1,4 @@
-#!/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
+#!/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
 
 from idlelib.PyShell import main
 if __name__ == '__main__':
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/pydoc
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/pydoc	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/pydoc	Thu May 13 08:38:18 2010 +0100
@@ -1,4 +1,4 @@
-#!/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
+#!/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
 
 import pydoc
 if __name__ == '__main__':
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/smtpd.py
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/smtpd.py	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/scripts-2.6/smtpd.py	Thu May 13 08:38:18 2010 +0100
@@ -1,4 +1,4 @@
-#!/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
+#!/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262/bin/python2.6
 """An RFC 2821 smtp proxy.
 
 Usage: %(program)s [options] [localhost:localport [remotehost:remoteport]]
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.log
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.log	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.log	Thu May 13 08:38:18 2010 +0100
@@ -4,7 +4,7 @@
 It was created by libffi configure 3.0.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure 
+  $ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure 
 
 ## --------- ##
 ## Platform. ##
@@ -371,17 +371,17 @@
 configure:6288: result: no
 configure:6315: checking for Fortran 77 compiler version
 configure:6322:  --version >&5
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6323: --version: command not found
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6323: --version: command not found
 configure:6325: $? = 127
 configure:6332:  -v >&5
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6333: -v: command not found
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6333: -v: command not found
 configure:6335: $? = 127
 configure:6342:  -V >&5
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6343: -V: command not found
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6343: -V: command not found
 configure:6345: $? = 127
 configure:6353: checking whether we are using the GNU Fortran 77 compiler
 configure:6372:  -c  conftest.F >&5
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6373: -c: command not found
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6373: -c: command not found
 configure:6378: $? = 127
 configure: failed program was:
 |       program main
@@ -393,7 +393,7 @@
 configure:6395: result: no
 configure:6401: checking whether  accepts -g
 configure:6418:  -c -g conftest.f >&5
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6419: -c: command not found
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure: line 6419: -c: command not found
 configure:6424: $? = 127
 configure: failed program was:
 |       program main
@@ -610,8 +610,8 @@
 config.status:742: creating include/ffi.h
 config.status:742: creating fficonfig.py
 config.status:742: creating fficonfig.h
-config.status:1027: linking /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/src/x86/ffitarget.h to include/ffitarget.h
-config.status:1027: linking /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/include/ffi_common.h to include/ffi_common.h
+config.status:1027: linking /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/src/x86/ffitarget.h to include/ffitarget.h
+config.status:1027: linking /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/include/ffi_common.h to include/ffi_common.h
 config.status:1049: executing depfiles commands
 config.status:1049: executing include commands
 config.status:1049: executing src commands
@@ -726,21 +726,21 @@
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run aclocal-1.10'
 ALLOCA=''
 ALPHA_FALSE=''
 ALPHA_TRUE='#'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run tar'
+AMTAR='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run tar'
 AM_RUNTESTFLAGS=''
 AR='ar'
 ARM_FALSE=''
 ARM_TRUE='#'
-AUTOCONF='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run automake-1.10'
+AUTOCONF='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run automake-1.10'
 AWK='gawk'
 CC='gcc -pthread'
 CCAS='gcc -pthread'
@@ -790,7 +790,7 @@
 MAINT='#'
 MAINTAINER_MODE_FALSE=''
 MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run makeinfo'
 MIPS_FALSE=''
 MIPS_TRUE='#'
 OBJEXT='o'
@@ -877,7 +877,7 @@
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/install-sh'
+install_sh='$(SHELL) /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.status
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.status	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/config.status	Thu May 13 08:38:18 2010 +0100
@@ -338,15 +338,15 @@
 
 ac_cs_version="\
 libffi config.status 3.0.5
-configured by /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure, generated by GNU Autoconf 2.61,
+configured by /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure, generated by GNU Autoconf 2.61,
   with options \"\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi'
-srcdir='/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi'
+ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi'
+srcdir='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
 # If no file are specified by the user, then we need to provide default
@@ -414,10 +414,10 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running CONFIG_SHELL=/bin/sh /bin/sh /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
+  echo "running CONFIG_SHELL=/bin/sh /bin/sh /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
   CONFIG_SHELL=/bin/sh
   export CONFIG_SHELL
-  exec /bin/sh "/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure" $ac_configure_extra_args --no-create --no-recursion
+  exec /bin/sh "/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/configure" $ac_configure_extra_args --no-create --no-recursion
 fi
 
 exec 5>>config.log
@@ -432,7 +432,7 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="" ac_aux_dir="/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi"
+AMDEP_TRUE="" ac_aux_dir="/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi"
 TARGETDIR="x86"
 
 
@@ -562,19 +562,19 @@
 s,@CYGPATH_W@,|#_!!_#|echo,g
 s,@PACKAGE@,|#_!!_#|libffi,g
 s,@VERSION@,|#_!!_#|3.0.5,g
-s,@ACLOCAL@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run aclocal-1.10,g
-s,@AUTOCONF@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoconf,g
-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run automake-1.10,g
-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoheader,g
-s,@MAKEINFO@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run makeinfo,g
-s,@install_sh@,|#_!!_#|$(SHELL) /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/install-sh,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run aclocal-1.10,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run automake-1.10,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|$(SHELL) /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/install-sh,g
 s,@STRIP@,|#_!!_#|strip,g
 s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
 s,@AWK@,|#_!!_#|gawk,g
 s,@SET_MAKE@,|#_!!_#|,g
 s,@am__leading_dot@,|#_!!_#|.,g
-s,@AMTAR@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run tar,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/missing --run tar,g
 s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
 s,@CC@,|#_!!_#|gcc -pthread,g
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/fficonfig.py
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/fficonfig.py	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/fficonfig.py	Thu May 13 08:38:18 2010 +0100
@@ -28,8 +28,8 @@
     'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
 }
 
-ffi_srcdir = '/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi'
+ffi_srcdir = '/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi'
 ffi_sources += ffi_platforms['X86']
-ffi_sources = [os.path.join('/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi', f) for f in ffi_sources]
+ffi_sources = [os.path.join('/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi', f) for f in ffi_sources]
 
 ffi_cflags = ''
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffi_common.h
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffi_common.h	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffi_common.h	Thu May 13 08:38:18 2010 +0100
@@ -1,1 +1,1 @@
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/include/ffi_common.h
\ No newline at end of file
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/include/ffi_common.h
\ No newline at end of file
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffitarget.h
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffitarget.h	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/build/temp.linux-i686-2.6/libffi/include/ffitarget.h	Thu May 13 08:38:18 2010 +0100
@@ -1,1 +1,1 @@
-/home/imk/symbian/epocroot-pdk-3.0.h/build-mcl-0f5e3a7fb6af/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/src/x86/ffitarget.h
\ No newline at end of file
+/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/Modules/_ctypes/libffi/src/x86/ffitarget.h
\ No newline at end of file
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.log
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.log	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.log	Thu May 13 08:38:18 2010 +0100
@@ -4,7 +4,7 @@
 It was created by python configure 2.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262 --enable-shared --with-threads
+  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262 --enable-shared --with-threads
 
 ## --------- ##
 ## Platform. ##
@@ -254,7 +254,7 @@
 configure:4926: result: no
 configure:4940: checking whether pthreads are available without options
 configure:4974: gcc -o conftest -O3 -mtune=i686 -s   conftest.c  >&5
-/tmp/cckU977M.o: In function `main':
+/tmp/cceTdPnS.o: In function `main':
 conftest.c:(.text+0x39): undefined reference to `pthread_create'
 conftest.c:(.text+0x58): undefined reference to `pthread_detach'
 collect2: ld returned 1 exit status
@@ -289,7 +289,7 @@
 configure:5021: checking whether gcc accepts -Kpthread
 configure:5057: gcc -Kpthread -o conftest -O3 -mtune=i686 -s   conftest.c  >&5
 gcc: unrecognized option '-Kpthread'
-/tmp/ccoHQB6S.o: In function `main':
+/tmp/ccx9oJTV.o: In function `main':
 conftest.c:(.text+0x39): undefined reference to `pthread_create'
 conftest.c:(.text+0x58): undefined reference to `pthread_detach'
 collect2: ld returned 1 exit status
@@ -324,7 +324,7 @@
 configure:5098: checking whether gcc accepts -Kthread
 configure:5134: gcc -Kthread -o conftest -O3 -mtune=i686 -s   conftest.c  >&5
 gcc: unrecognized option '-Kthread'
-/tmp/ccuT0P5T.o: In function `main':
+/tmp/cczKix51.o: In function `main':
 conftest.c:(.text+0x39): undefined reference to `pthread_create'
 conftest.c:(.text+0x58): undefined reference to `pthread_detach'
 collect2: ld returned 1 exit status
@@ -3351,7 +3351,7 @@
 configure:13403: result: no
 configure:13417: checking for library containing sem_init
 configure:13458: gcc -o conftest -O3 -mtune=i686 -s   conftest.c -ldl  >&5
-/tmp/ccl3jtYW.o: In function `main':
+/tmp/ccl04HVq.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `sem_init'
 collect2: ld returned 1 exit status
 configure:13464: $? = 1
@@ -3582,7 +3582,7 @@
 configure:13564: result: no
 configure:13634: checking for t_open in -lnsl
 configure:13669: gcc -o conftest -O3 -mtune=i686 -s   conftest.c -lnsl  -lpthread -ldl  >&5
-/tmp/ccFFnYe3.o: In function `main':
+/tmp/ccb7Er6B.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `t_open'
 collect2: ld returned 1 exit status
 configure:13675: $? = 1
@@ -4088,7 +4088,7 @@
 configure:16280: result: yes
 configure:16200: checking for getwd
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccHKAOn2.o: In function `main':
+/tmp/ccEZjQwt.o: In function `main':
 conftest.c:(.text+0x7): warning: the `getwd' function is dangerous and should not be used.
 configure:16262: $? = 0
 configure:16280: result: yes
@@ -4312,7 +4312,7 @@
 configure:16280: result: yes
 configure:16200: checking for plock
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccz3k12R.o: In function `main':
+/tmp/ccoha6Kf.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `plock'
 collect2: ld returned 1 exit status
 configure:16262: $? = 1
@@ -4501,7 +4501,7 @@
 configure:16280: result: yes
 configure:16200: checking for pthread_init
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccooWiCX.o: In function `main':
+/tmp/ccqf07ge.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `pthread_init'
 collect2: ld returned 1 exit status
 configure:16262: $? = 1
@@ -4781,7 +4781,7 @@
 configure:16280: result: yes
 configure:16200: checking for tempnam
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/cc2UkY59.o: In function `main':
+/tmp/ccUtsSsy.o: In function `main':
 conftest.c:(.text+0x7): warning: the use of `tempnam' is dangerous, better use `mkstemp'
 configure:16262: $? = 0
 configure:16280: result: yes
@@ -4799,13 +4799,13 @@
 configure:16280: result: yes
 configure:16200: checking for tmpnam
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccdJhyVp.o: In function `main':
+/tmp/ccObq6JQ.o: In function `main':
 conftest.c:(.text+0x7): warning: the use of `tmpnam' is dangerous, better use `mkstemp'
 configure:16262: $? = 0
 configure:16280: result: yes
 configure:16200: checking for tmpnam_r
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccInVJ3v.o: In function `main':
+/tmp/cc1457XR.o: In function `main':
 conftest.c:(.text+0x7): warning: the use of `tmpnam_r' is dangerous, better use `mkstemp'
 configure:16262: $? = 0
 configure:16280: result: yes
@@ -4843,7 +4843,7 @@
 configure:16280: result: yes
 configure:16200: checking for _getpty
 configure:16256: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccgmxVd5.o: In function `main':
+/tmp/ccrXA7xt.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `_getpty'
 collect2: ld returned 1 exit status
 configure:16262: $? = 1
@@ -5514,7 +5514,7 @@
 configure:16978: result: yes
 configure:17060: checking for chflags
 configure:17092: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccRx0tIp.o: In function `main':
+/tmp/cc3fU8oP.o: In function `main':
 conftest.c:(.text+0x1a): warning: warning: chflags is not implemented and will always fail
 configure:17095: $? = 0
 configure:17101: ./conftest
@@ -5720,7 +5720,7 @@
 configure:17119: result: no
 configure:17128: checking for lchflags
 configure:17160: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/ccKdV52v.o: In function `main':
+/tmp/ccPGG7BT.o: In function `main':
 conftest.c:(.text+0x1a): undefined reference to `lchflags'
 collect2: ld returned 1 exit status
 configure:17163: $? = 1
@@ -5945,7 +5945,7 @@
 configure:17503: result: yes
 configure:17522: checking for openpty
 configure:17578: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  >&5
-/tmp/cc7MI4TQ.o: In function `main':
+/tmp/ccMgV5be.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `openpty'
 collect2: ld returned 1 exit status
 configure:17584: $? = 1
@@ -6195,7 +6195,7 @@
 configure:18072: result: yes
 configure:18093: checking for fseek64
 configure:18149: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  -lutil >&5
-/tmp/ccTSApFa.o: In function `main':
+/tmp/ccAhbdtv.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `fseek64'
 collect2: ld returned 1 exit status
 configure:18155: $? = 1
@@ -6443,7 +6443,7 @@
 configure:18173: result: yes
 configure:18093: checking for ftell64
 configure:18149: gcc -pthread -o conftest -O3 -mtune=i686 -s   conftest.c -lpthread -ldl  -lutil >&5
-/tmp/ccT9wy6m.o: In function `main':
+/tmp/cc0tpUkx.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `ftell64'
 collect2: ld returned 1 exit status
 configure:18155: $? = 1
@@ -13920,7 +13920,7 @@
 CFLAGS='-O3 -mtune=i686 -s'
 CFLAGSFORSHARED='$(CCSHARED)'
 CONFIGURE_MACOSX_DEPLOYMENT_TARGET=''
-CONFIG_ARGS=' '\''--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262'\'' '\''--enable-shared'\'' '\''--with-threads'\'' '\''CFLAGS=-O3 -mtune=i686 -s'\'''
+CONFIG_ARGS=' '\''--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262'\'' '\''--enable-shared'\'' '\''--with-threads'\'' '\''CFLAGS=-O3 -mtune=i686 -s'\'''
 CPP='gcc -E'
 CPPFLAGS=''
 CXX='g++ -pthread'
@@ -13940,7 +13940,7 @@
 FRAMEWORKALTINSTALLLAST=''
 FRAMEWORKINSTALLFIRST=''
 FRAMEWORKINSTALLLAST=''
-FRAMEWORKUNIXTOOLSPREFIX='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262'
+FRAMEWORKUNIXTOOLSPREFIX='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262'
 GREP='/bin/grep'
 HAVE_GETHOSTBYNAME=''
 HAVE_GETHOSTBYNAME_R=''
@@ -13984,7 +13984,7 @@
 PYTHONFRAMEWORKINSTALLDIR=''
 PYTHONFRAMEWORKPREFIX=''
 RANLIB='ranlib'
-RUNSHARED='LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:'
+RUNSHARED='LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:'
 SGI_ABI=''
 SHELL='/bin/sh'
 SHLIBS='$(LIBS)'
@@ -14021,7 +14021,7 @@
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262'
+prefix='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.status
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.status	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/config.status	Thu May 13 08:38:18 2010 +0100
@@ -331,13 +331,13 @@
 ac_cs_version="\
 python config.status 2.6
 configured by ./configure, generated by GNU Autoconf 2.61,
-  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'\"
+  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s'\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2'
+ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 # If no file are specified by the user, then we need to provide default
@@ -405,10 +405,10 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s' $ac_configure_extra_args " --no-create --no-recursion" >&6
   CONFIG_SHELL=/bin/sh
   export CONFIG_SHELL
-  exec /bin/sh "./configure" '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s' $ac_configure_extra_args --no-create --no-recursion
+  exec /bin/sh "./configure" '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s' $ac_configure_extra_args --no-create --no-recursion
 fi
 
 exec 5>>config.log
@@ -497,7 +497,7 @@
 s,@PACKAGE_STRING@,|#_!!_#|python 2.6,g
 s,@PACKAGE_BUGREPORT@,|#_!!_#|http://www.python.org/python-bugs,g
 s,@exec_prefix@,|#_!!_#|${prefix},g
-s,@prefix@,|#_!!_#|/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262,g
+s,@prefix@,|#_!!_#|/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262,g
 s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g
 s,@bindir@,|#_!!_#|${exec_prefix}/bin,g
 s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g
@@ -528,7 +528,7 @@
 s,@target_alias@,|#_!!_#|,g
 s,@VERSION@,|#_!!_#|2.6,g
 s,@SOVERSION@,|#_!!_#|1.0,g
-s,@CONFIG_ARGS@,|#_!!_#| '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s',g
+s,@CONFIG_ARGS@,|#_!!_#| '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262' '--enable-shared' '--with-threads' 'CFLAGS=-O3 -mtune=i686 -s',g
 s,@UNIVERSALSDK@,|#_!!_#|,g
 s,@ARCH_RUN_32BIT@,|#_!!_#|,g
 s,@PYTHONFRAMEWORK@,|#_!!_#|,g
@@ -540,7 +540,7 @@
 s,@FRAMEWORKINSTALLLAST@,|#_!!_#|,g
 s,@FRAMEWORKALTINSTALLFIRST@,|#_!!_#|,g
 s,@FRAMEWORKALTINSTALLLAST@,|#_!!_#|,g
-s,@FRAMEWORKUNIXTOOLSPREFIX@,|#_!!_#|/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/python262,g
+s,@FRAMEWORKUNIXTOOLSPREFIX@,|#_!!_#|/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/python262,g
 s,@MACHDEP@,|#_!!_#|linux2,g
 s,@SGI_ABI@,|#_!!_#|,g
 s,@EXTRAPLATDIR@,|#_!!_#|,g
@@ -566,7 +566,7 @@
 s,@BLDLIBRARY@,|#_!!_#|-L. -lpython$(VERSION),g
 s,@LDLIBRARYDIR@,|#_!!_#|,g
 s,@INSTSONAME@,|#_!!_#|libpython$(VERSION).so.1.0,g
-s,@RUNSHARED@,|#_!!_#|LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:,g
+s,@RUNSHARED@,|#_!!_#|LD_LIBRARY_PATH=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2:,g
 s,@LINKCC@,|#_!!_#|$(PURIFY) $(MAINCC),g
 s,@RANLIB@,|#_!!_#|ranlib,g
 s,@AR@,|#_!!_#|ar,g
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.so
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.so has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.so.1.0
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/libpython2.6.so.1.0 has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/python
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/Python-2.6.2/python has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -27,7 +27,7 @@
 PACKAGE_VERSION = 4.0-release
 
 # Include some boilerplate Gnu makefile definitions.
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 
 exec_prefix = ${prefix}
 
@@ -54,8 +54,8 @@
 DESTDIR =
 
 topdir = .
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
-top_builddir = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+top_builddir = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 srcdir = .
 VPATH = .
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bash
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bash has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bashbug
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bashbug	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bashbug	Thu May 13 08:38:18 2010 +0100
@@ -29,7 +29,7 @@
 MACHINE="i686"
 OS="linux-gnu"
 CC="gcc"
-CFLAGS=" -DPROGRAM='bash' -DCONF_HOSTTYPE='i686' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i686-pc-linux-gnu' -DCONF_VENDOR='pc' -DLOCALEDIR='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H   -I.  -I. -I./include -I./lib   -O2 -mtune=i686 -s"
+CFLAGS=" -DPROGRAM='bash' -DCONF_HOSTTYPE='i686' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i686-pc-linux-gnu' -DCONF_VENDOR='pc' -DLOCALEDIR='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H   -I.  -I. -I./include -I./lib   -O2 -mtune=i686 -s"
 RELEASE="4.0"
 PATCHLEVEL="24"
 RELSTATUS="release"
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bashversion
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/bashversion has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -33,7 +33,7 @@
 
 EXEEXT = 
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 
 srcdir = .
 VPATH = .
@@ -50,7 +50,7 @@
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 LIBBUILD = ${BUILD_DIR}/lib
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/libbuiltins.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/libbuiltins.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/psize.aux
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/builtins/psize.aux has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.log
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.log	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.log	Thu May 13 08:38:18 2010 +0100
@@ -4,7 +4,7 @@
 It was created by bash configure 4.0-release, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
-  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11 --enable-arith-for-command --enable-multibyte --enable-job-control --enable-progcomp --enable-process-substitution --enable-readline --disable-rpath
+  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11 --enable-arith-for-command --enable-multibyte --enable-job-control --enable-progcomp --enable-process-substitution --enable-readline --disable-rpath
 
 ## --------- ##
 ## Platform. ##
@@ -2613,7 +2613,7 @@
 configure:12537: result: yes
 configure:12546: checking for _doprnt
 configure:12602: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/cc0Z7ONw.o: In function `main':
+/tmp/ccJsE8gF.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:12609: $? = 1
@@ -2973,7 +2973,7 @@
 configure:12814: result: void
 configure:12823: checking for __setostype
 configure:12879: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/cc24b5py.o: In function `main':
+/tmp/ccIELn4P.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `__setostype'
 collect2: ld returned 1 exit status
 configure:12886: $? = 1
@@ -3250,7 +3250,7 @@
 configure:13404: result: yes
 configure:13319: checking for setdtablesize
 configure:13375: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/ccBOXK0E.o: In function `main':
+/tmp/ccF5fAQU.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `setdtablesize'
 collect2: ld returned 1 exit status
 configure:13382: $? = 1
@@ -3712,7 +3712,7 @@
 configure:14182: result: yes
 configure:14206: checking for fdprintf
 configure:14262: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/cc4SIzBC.o: In function `main':
+/tmp/ccwsGeMY.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `fdprintf'
 collect2: ld returned 1 exit status
 configure:14269: $? = 1
@@ -4054,7 +4054,7 @@
 configure:15577: result: yes
 configure:15492: checking for fpurge
 configure:15548: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/cc7m2rOq.o: In function `main':
+/tmp/ccRt0CAZ.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `fpurge'
 collect2: ld returned 1 exit status
 configure:15555: $? = 1
@@ -4455,7 +4455,7 @@
 configure:17122: result: yes
 configure:17131: checking for mbscmp
 configure:17187: gcc -o conftest -O2 -mtune=i686 -s   conftest.c  >&5
-/tmp/ccNVx1Rq.o: In function `main':
+/tmp/ccYosoX6.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `mbscmp'
 collect2: ld returned 1 exit status
 configure:17194: $? = 1
@@ -12527,7 +12527,7 @@
 configure:29256: result: no
 configure:29409: checking for tgetent
 configure:29465: gcc -o conftest -O2 -mtune=i686 -s   conftest.c -ldl  >&5
-/tmp/ccj3oPZt.o: In function `main':
+/tmp/ccANplQ8.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `tgetent'
 collect2: ld returned 1 exit status
 configure:29472: $? = 1
@@ -13342,7 +13342,7 @@
 AR='ar'
 ARFLAGS='cr'
 BASHVERS='4.0'
-BUILD_DIR='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0'
+BUILD_DIR='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0'
 BUILD_INCLUDED_LIBINTL='no'
 CATOBJEXT='.gmo'
 CC='gcc'
@@ -13482,7 +13482,7 @@
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11'
+prefix='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.status
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.status	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/config.status	Thu May 13 08:38:18 2010 +0100
@@ -357,13 +357,13 @@
 ac_cs_version="\
 bash config.status 4.0-release
 configured by ./configure, generated by GNU Autoconf 2.63,
-  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11' '--enable-arith-for-command' '--enable-multibyte' '--enable-job-control' '--enable-progcomp' '--enable-process-substitution' '--enable-readline' '--disable-rpath' 'CFLAGS=-O2 -mtune=i686 -s'\"
+  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11' '--enable-arith-for-command' '--enable-multibyte' '--enable-job-control' '--enable-progcomp' '--enable-process-substitution' '--enable-readline' '--disable-rpath' 'CFLAGS=-O2 -mtune=i686 -s'\"
 
 Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0'
+ac_pwd='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 test -n "$AWK" || AWK=awk
@@ -437,7 +437,7 @@
 fi
 
 if $ac_cs_recheck; then
-  set X '/bin/sh' './configure'  '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11' '--enable-arith-for-command' '--enable-multibyte' '--enable-job-control' '--enable-progcomp' '--enable-process-substitution' '--enable-readline' '--disable-rpath' 'CFLAGS=-O2 -mtune=i686 -s' $ac_configure_extra_args --no-create --no-recursion
+  set X '/bin/sh' './configure'  '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11' '--enable-arith-for-command' '--enable-multibyte' '--enable-job-control' '--enable-progcomp' '--enable-process-substitution' '--enable-readline' '--disable-rpath' 'CFLAGS=-O2 -mtune=i686 -s' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
   CONFIG_SHELL='/bin/sh'
@@ -560,7 +560,7 @@
 S["RELSTATUS"]="release"
 S["BASHVERS"]="4.0"
 S["ARFLAGS"]="cr"
-S["BUILD_DIR"]="/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0"
+S["BUILD_DIR"]="/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0"
 S["incdir"]=""
 S["PROFILE_FLAGS"]=""
 S["SHOBJ_STATUS"]="supported"
@@ -692,7 +692,7 @@
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11"
+S["prefix"]="/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_BUGREPORT"]="bug-bash@gnu.org"
 S["PACKAGE_STRING"]="bash 4.0-release"
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/doc/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/doc/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/doc/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -31,7 +31,7 @@
 srcdir = .
 VPATH = .
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 
 datarootdir = ${prefix}/share
@@ -54,7 +54,7 @@
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 SUPPORT_SRCDIR = $(topdir)/support
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -18,7 +18,7 @@
 #
 
 # Include some boilerplate Gnu makefile definitions.
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 
 exec_prefix = ${prefix}
 bindir = ${exec_prefix}/bin
@@ -29,7 +29,7 @@
 datarootdir = ${prefix}/share
 
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 srcdir = .
 VPATH = .
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/perl/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/perl/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/examples/loadables/perl/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -19,7 +19,7 @@
 #
 
 # Include some boilerplate Gnu makefile definitions.
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 
 bindir = ${exec_prefix}/bin
@@ -30,7 +30,7 @@
 datarootdir = ${prefix}/share
 
 topdir = ../../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 srcdir = .
 VPATH = .
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/glob/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/glob/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/glob/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -22,7 +22,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/glob/libglob.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/glob/libglob.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/intl/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/intl/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/intl/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -22,10 +22,10 @@
 
 srcdir = .
 top_srcdir = ../..
-top_builddir = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+top_builddir = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 transform = s,x,x,
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/malloc/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/malloc/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/malloc/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -18,7 +18,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/malloc/libmalloc.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/malloc/libmalloc.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -30,7 +30,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 datarootdir = ${prefix}/share
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/libhistory.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/libhistory.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/libreadline.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/readline/libreadline.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/sh/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/sh/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/sh/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -28,7 +28,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 LIBBUILD = ${BUILD_DIR}/lib
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/sh/libsh.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/sh/libsh.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/termcap/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/termcap/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/termcap/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -22,7 +22,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 libdir = ${exec_prefix}/lib
 
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/tilde/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/tilde/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/tilde/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -22,7 +22,7 @@
 srcdir = .
 VPATH = .
 topdir = ../..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/tilde/libtilde.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/lib/tilde/libtilde.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/mksignames
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/mksignames has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/mksyntax
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/mksyntax has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/pathnames.h
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/pathnames.h	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/pathnames.h	Thu May 13 08:38:18 2010 +0100
@@ -28,6 +28,6 @@
 #define SYS_PROFILE "/etc/profile"
 
 /* The default location of the bash debugger initialization/startup file. */
-#define DEBUGGER_START_FILE	"/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11/share/bashdb/bashdb-main.inc"
+#define DEBUGGER_START_FILE	"/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11/share/bashdb/bashdb-main.inc"
 
 #endif /* _PATHNAMES_H */
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -19,9 +19,9 @@
 
 
 topdir = ..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 
 datarootdir = ${prefix}/share
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile.in
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile.in	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/po/Makefile.in	Thu May 13 08:38:18 2010 +0100
@@ -19,9 +19,9 @@
 
 
 topdir = ..
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 
 datarootdir = ${prefix}/share
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/support/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/support/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0/support/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -29,7 +29,7 @@
 topdir = ..
 srcdir = .
 VPATH = .
-BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
+BUILD_DIR = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/bash-4.0
 
 RM	= rm -f
 SHELL	= /bin/sh
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.log
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.log	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.log	Thu May 13 08:38:18 2010 +0100
@@ -4,7 +4,7 @@
 It was created by configure, which was
 generated by GNU Autoconf 2.52.20061216.  Invocation command line was
 
-  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 
 ## ---------- ##
 ## Platform.  ##
@@ -598,7 +598,7 @@
 configure:5361: result: no
 configure:6413: checking if -lm needed for math functions
 configure:6435: gcc -o conftest -O3 -mtune=i686 -s  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64   conftest.c  >&5
-/tmp/ccB5oJGA.o: In function `main':
+/tmp/cc7cC6yR.o: In function `main':
 conftest.c:(.text+0x34): undefined reference to `sqrt'
 collect2: ld returned 1 exit status
 configure:6438: $? = 1
@@ -657,7 +657,7 @@
 configure:8809: result: 5.7.20090803
 configure:8815: checking if we have identified curses libraries
 configure:8830: gcc -o conftest -O3 -mtune=i686 -s  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64   conftest.c  -lm >&5
-/tmp/ccdG64xT.o: In function `main':
+/tmp/ccqP46Wa.o: In function `main':
 conftest.c:(.text+0xa): undefined reference to `initscr'
 conftest.c:(.text+0x26): undefined reference to `tgoto'
 collect2: ld returned 1 exit status
@@ -676,7 +676,7 @@
 configure:8848: result: no
 configure:9050: checking for tgoto
 configure:9087: gcc -o conftest -O3 -mtune=i686 -s  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64   conftest.c  -lm -L/lib >&5
-/tmp/ccvn6OBX.o: In function `main':
+/tmp/cc5cIKZe.o: In function `main':
 conftest.c:(.text+0xb): undefined reference to `tgoto'
 collect2: ld returned 1 exit status
 configure:9090: $? = 1
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.status
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.status	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/config.status	Thu May 13 08:38:18 2010 +0100
@@ -105,7 +105,7 @@
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.52.20061216,
-  with options \"--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s'\"
+  with options \"--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s'\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
@@ -135,8 +135,8 @@
   case $1 in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running /bin/sh ./configure " --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s' " --no-create --no-recursion"
-    exec /bin/sh ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s' --no-create --no-recursion ;;
+    echo "running /bin/sh ./configure " --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s' " --no-create --no-recursion"
+    exec /bin/sh ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11 'CFLAGS=-O3 -mtune=i686 -s' --no-create --no-recursion ;;
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
@@ -255,7 +255,7 @@
    s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
 s,@SHELL@,/bin/sh,;t t
 s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11,;t t
+s,@prefix@,/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11,;t t
 s,@program_transform_name@,s,x,x,,;t t
 s,@bindir@,${exec_prefix}/bin,;t t
 s,@sbindir@,${exec_prefix}/sbin,;t t
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/dialog-config
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/dialog-config	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/dialog-config	Thu May 13 08:38:18 2010 +0100
@@ -28,7 +28,7 @@
 # authorization.                                                             #
 ##############################################################################
 
-prefix="/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11"
+prefix="/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11"
 exec_prefix="${prefix}"
 
 bindir="${exec_prefix}/bin"
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/libdialog.a
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/libdialog.a has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/makefile	Thu May 13 08:38:18 2010 +0100
@@ -6,7 +6,7 @@
 srcdir		= .
 
 
-prefix		= /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix		= /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix	= ${prefix}
 
 top_builddir	= .
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/samples/install/makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/samples/install/makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/dialog-1.1-20080819/samples/install/makefile	Thu May 13 08:38:18 2010 +0100
@@ -3,7 +3,7 @@
 #
 SHELL		= /bin/sh
 
-prefix		= /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix		= /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix	= ${prefix}
 
 srcdir		= .
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -144,15 +144,15 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
+AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -185,7 +185,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
 MAKE_HOST = i686-pc-linux-gnu
 MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs
 MSGFMT = :
@@ -241,14 +241,14 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
+install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
 mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/build.sh
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/build.sh	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/build.sh	Thu May 13 08:38:18 2010 +0100
@@ -35,7 +35,7 @@
 EXEEXT=''
 
 # Common prefix for machine-independent installed files.
-prefix='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11'
+prefix='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11'
 # Common prefix for machine-dependent installed files.
 exec_prefix=`eval echo ${prefix}`
 # Directory to find libraries in for `-lXXX'.
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.log
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.log	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.log	Thu May 13 08:38:18 2010 +0100
@@ -4,7 +4,7 @@
 It was created by GNU make configure 3.81, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
-  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11 --disable-job-server
+  $ ./configure --prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11 --disable-job-server
 
 ## --------- ##
 ## Platform. ##
@@ -683,7 +683,7 @@
 configure:7946: result: yes
 configure:7962: checking for library containing clock_gettime
 configure:7992: gcc -o conftest -O2 -mtune=i686   conftest.c  >&5
-/tmp/ccHANHLV.o: In function `main':
+/tmp/ccMjIPzI.o: In function `main':
 conftest.c:(.text+0x7): undefined reference to `clock_gettime'
 collect2: ld returned 1 exit status
 configure:7998: $? = 1
@@ -821,7 +821,7 @@
 configure:8334: result: yes
 configure:8247: checking for mktemp
 configure:8304: gcc -o conftest -O2 -mtune=i686   conftest.c -lrt  >&5
-/tmp/ccddyS6s.o: In function `main':
+/tmp/cc3YGxJh.o: In function `main':
 conftest.c:(.text+0x8): warning: the use of `mktemp' is dangerous, better use `mkstemp' or `mkdtemp'
 configure:8310: $? = 0
 configure:8313: test -z 			 || test ! -s conftest.err
@@ -1369,9 +1369,9 @@
 configure:9502: result: yes
 configure:9509: checking for _doprnt
 configure:9566: gcc -o conftest -O2 -mtune=i686   conftest.c -lrt  >&5
-/tmp/ccXgWMCa.o: In function `main':
+/tmp/ccvTe9y6.o: In function `main':
 conftest.c:(.text+0x8): undefined reference to `_doprnt'
-/tmp/ccXgWMCa.o:(.data+0x0): undefined reference to `_doprnt'
+/tmp/ccvTe9y6.o:(.data+0x0): undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:9572: $? = 1
 configure: failed program was:
@@ -1521,9 +1521,9 @@
 configure:9770: result: yes
 configure:9784: checking for pstat_getdynamic
 configure:9841: gcc -o conftest -O2 -mtune=i686   conftest.c -lrt  >&5
-/tmp/ccvgutsm.o: In function `main':
+/tmp/ccyWOwjj.o: In function `main':
 conftest.c:(.text+0x8): undefined reference to `pstat_getdynamic'
-/tmp/ccvgutsm.o:(.data+0x0): undefined reference to `pstat_getdynamic'
+/tmp/ccyWOwjj.o:(.data+0x0): undefined reference to `pstat_getdynamic'
 collect2: ld returned 1 exit status
 configure:9847: $? = 1
 configure: failed program was:
@@ -2305,17 +2305,17 @@
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9'
+ACLOCAL='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9'
 ALLOCA=''
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar'
+AMTAR='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar'
 ANSI2KNR=''
 AR='ar'
-AUTOCONF='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9'
+AUTOCONF='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9'
 AWK='gawk'
 CC='gcc'
 CCDEPMODE='depmode=gcc3'
@@ -2348,7 +2348,7 @@
 LTLIBICONV='-liconv'
 LTLIBINTL=''
 LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo'
 MAKE_HOST='i686-pc-linux-gnu'
 MKINSTALLDIRS='$(top_builddir)/config/mkinstalldirs'
 MSGFMT=':'
@@ -2404,14 +2404,14 @@
 host_vendor='pc'
 includedir='${prefix}/include'
 infodir='${prefix}/info'
-install_sh='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh'
+install_sh='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localstatedir='${prefix}/var'
 mandir='${prefix}/man'
 mkdir_p='mkdir -p --'
 oldincludedir='/usr/include'
-prefix='/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11'
+prefix='/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11'
 program_transform_name='s,x,x,'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.status
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.status	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config.status	Thu May 13 08:38:18 2010 +0100
@@ -304,7 +304,7 @@
 ac_cs_version="\
 GNU make config.status 3.81
 configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686'\"
+  with options \"'--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686'\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -383,8 +383,8 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure " '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686' $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686' $ac_configure_extra_args --no-create --no-recursion
+  echo "running /bin/sh ./configure " '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec /bin/sh ./configure '--prefix=/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11' '--disable-job-server' 'CFLAGS=-O2 -mtune=i686' $ac_configure_extra_args --no-create --no-recursion
 fi
 
 #
@@ -473,7 +473,7 @@
 s,@PACKAGE_STRING@,GNU make 3.81,;t t
 s,@PACKAGE_BUGREPORT@,bug-make@gnu.org,;t t
 s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11,;t t
+s,@prefix@,/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11,;t t
 s,@program_transform_name@,s,x,x,,;t t
 s,@bindir@,${exec_prefix}/bin,;t t
 s,@sbindir@,${exec_prefix}/sbin,;t t
@@ -501,12 +501,12 @@
 s,@CYGPATH_W@,echo,;t t
 s,@PACKAGE@,make,;t t
 s,@VERSION@,3.81,;t t
-s,@ACLOCAL@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo,;t t
-s,@install_sh@,/home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh,;t t
+s,@ACLOCAL@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9,;t t
+s,@AUTOCONF@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf,;t t
+s,@AUTOMAKE@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9,;t t
+s,@AUTOHEADER@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader,;t t
+s,@MAKEINFO@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo,;t t
+s,@install_sh@,/home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh,;t t
 s,@STRIP@,,;t t
 s,@ac_ct_STRIP@,,;t t
 s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
@@ -514,7 +514,7 @@
 s,@AWK@,gawk,;t t
 s,@SET_MAKE@,,;t t
 s,@am__leading_dot@,.,;t t
-s,@AMTAR@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar,;t t
+s,@AMTAR@,${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar,;t t
 s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
 s,@am__untar@,${AMTAR} xf -,;t t
 s,@CC@,gcc,;t t
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -71,15 +71,15 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
+AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -112,7 +112,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
 MAKE_HOST = i686-pc-linux-gnu
 MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs
 MSGFMT = :
@@ -168,14 +168,14 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
+install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
 mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/doc/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/doc/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/doc/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -86,15 +86,15 @@
 DVIPS = dvips
 am__installdirs = "$(DESTDIR)$(infodir)"
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
+AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -127,7 +127,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
 MAKE_HOST = i686-pc-linux-gnu
 MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs
 MSGFMT = :
@@ -183,14 +183,14 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
+install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
 mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/glob/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/glob/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/glob/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -87,15 +87,15 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
+AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -128,7 +128,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
 MAKE_HOST = i686-pc-linux-gnu
 MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs
 MSGFMT = :
@@ -184,14 +184,14 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
+install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
 mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/make
Binary file sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/make has changed
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -20,7 +20,7 @@
 top_srcdir = ..
 
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile.in
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile.in	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/po/Makefile.in	Thu May 13 08:38:18 2010 +0100
@@ -20,7 +20,7 @@
 top_srcdir = ..
 
 
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
diff -r 301c3edbdaa1 -r 787612182dd0 sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/w32/Makefile
--- a/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/w32/Makefile	Wed May 12 09:52:26 2010 +0100
+++ b/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/w32/Makefile	Thu May 13 08:38:18 2010 +0100
@@ -88,15 +88,15 @@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
+AMTAR = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -129,7 +129,7 @@
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/missing --run makeinfo
 MAKE_HOST = i686-pc-linux-gnu
 MKINSTALLDIRS = $(top_builddir)/config/mkinstalldirs
 MSGFMT = :
@@ -185,14 +185,14 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
+install_sh = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util/build/linux-unknown-libc2_11/make-3.81/config/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var
 mandir = ${prefix}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
-prefix = /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/linux-unknown-libc2_11
+prefix = /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/linux-unknown-libc2_11
 program_transform_name = s,x,x,
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com