# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1242643177 -3600
# Node ID aa585d28e58404863a929a76d232e8bd68583537
# Parent  4f54ca96b7e89f4a2c0eb9b8916d2f5581c3851d# Parent  d9f19d792d0c0b586c0285accef30a5d79659e41
Merge updates from master

diff -r 4f54ca96b7e8 -r aa585d28e584 common/templates/zip.cfg.xml.ftl.template
--- a/common/templates/zip.cfg.xml.ftl.template	Mon May 18 11:37:55 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template	Mon May 18 11:39:37 2009 +0100
@@ -28,7 +28,7 @@
 			<config name="sfl" abstract="true">
 				<set name="grace.filters" value="src" />
 			</config>
-			<config name="epl" abstract="true">
+			<config name="oss" abstract="true">
 				<set name="grace.filters" value="src" />
 			</config>
 			<config name="rnd" abstract="true">
diff -r 4f54ca96b7e8 -r aa585d28e584 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Mon May 18 11:37:55 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Mon May 18 11:39:37 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}},
 		{