# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1270036343 -3600
# Node ID 72efe73cb3cf7d36133182ee438da74a976fb364
# Parent  28714977dccbdf1a9f40216e770427955bc19f52
FIxed package config script to be able to handle utilities repo being at old URL, or new URL.

diff -r 28714977dccb -r 72efe73cb3cf common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Wed Mar 31 10:20:44 2010 +0100
+++ b/common/tools/populateziptemplate.pl	Wed Mar 31 12:52:23 2010 +0100
@@ -72,15 +72,21 @@
 {
 	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|oss)/(MCL|FCL)/(sf|sftools|interim)/(([^/]+)/)?([^/]+)?})
+	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities|sftools|interim)/(([^/]+)/)?([^/]+)?})
 	{
 		my ($license, $codeline, $thingy, $layer, $packageName) = ($1, $2, $3, $5, $6);
 		# $thingy is the part of the path after the codeline. For
 		# platform packages, it's "sf". For the utilities package, it's
-		# "sftools".
+		# "sftools", or "utilities, depending on the URL used to
+		# obtain it.
 		#
 		# I can't think of anything to describe this item, hence $thingy
-		if ($thingy eq "sftools")
+		if ($thingy eq "utilities")
+		{
+			$layer = "tools";
+			$packageName = "utilities";
+		}
+		elsif ($thingy eq "sftools")
 		{
 			$layer = "tools";
 		}