# HG changeset patch
# User ThomasE@UK-ThomasE.symbian.int
# Date 1242228380 -3600
# Node ID fb924d87bc0c72b04bf6ec54503d9d6e07988a6d
# Parent  5e9bdb9269c7e414d65af66c640f8ed61101ed31# Parent  27826401fee51a09b9bccce864627198b5f95dfb
Merge with previous modifications.

diff -r 27826401fee5 -r fb924d87bc0c common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Wed May 13 13:50:18 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Wed May 13 16:26:20 2009 +0100
@@ -57,7 +57,7 @@
 {
 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
 	$package->{dst} =~ s{^/}{}g;
-	if ($package->{source} =~ m{/(sfl|epl)/sf/([^/]+)/([^/]+)})
+	if ($package->{source} =~ m{/(sfl|oss)/sf/([^/]+)/([^/]+)})
 	{	    
 		push @{$zipConfig->{config}->{config}->{src}->{config}->{$1}->{config}},
 		{