Reported by Bastiaan Huisman <huisman@science.uva.nl>

       * scripts/tzabbrevs: Change America/Buenos_Aires to
       America/Argentina/Buenos_Aires for AGT link.
       * timezones.pl (parseTime): Assume and return wall time.
       Reindent output.
       * java/util/TimeZone.java (timezones): Regenerate using tzdata2005l.

2 files changed, 16 insertions, 16 deletions

diff --git a/scripts/timezones.pl b/scripts/timezones.pl
index 47f71370c..5eebb40bc 100755
--- a/scripts/timezones.pl
+++ b/scripts/timezones.pl
@@ -43,7 +43,7 @@ sub parseOffset($) {
 }
 
 # parse the time of form +/-hh:mm:ss[swguz]  (:ss is optional) and return it
-# in milliseconds since midnight in local standard time
+# in milliseconds since midnight in local wall time
     my $timezonename;
 sub parseTime($$$) {
     my ($rawoffset, $stdoffset, $time) = @_;
@@ -55,11 +55,11 @@ sub parseTime($$$) {
     if ($1 eq "-") {
       $millis = -$millis;
     }
+    # Normally millis is in wall time, adjust for utc and standard time.
     if ($6 =~ /[guz]/) {
-	$millis += $rawoffset;
-    } elsif ($6 =~ /w/) {
-	print STDERR "$timezonename not in standard time\n" if $stdoffset;
-	$millis -= $stdoffset;
+	$millis += $rawoffset + $stdoffset;
+    } elsif ($6 =~ /s/) {
+	$millis += $stdoffset;
     }
     return $millis;
 }
@@ -331,7 +331,7 @@ for (@timezones) {
     $rawoffset = makePretty($rawoffset);
     if ($rule eq "-") {
 	print <<EOF
-    tz = new SimpleTimeZone($rawoffset, \"$name\");
+	tz = new SimpleTimeZone($rawoffset, \"$name\");
 EOF
     } else {
 	my ($endmonth, $endday, $endtime) = @{$rule->[0]};
@@ -341,24 +341,24 @@ EOF
 	my $savings = $rule->[2];
 	if ($savings == 3600 * 1000) {
 	    print <<EOF
-    tz = new SimpleTimeZone
-      ($rawoffset, \"$name\",
-       $startmonth, $startday, $starttime,
-       $endmonth, $endday, $endtime);
+	tz = new SimpleTimeZone
+	  ($rawoffset, \"$name\",
+	   $startmonth, $startday, $starttime,
+	   $endmonth, $endday, $endtime);
 EOF
 	} else {
 	    $savings = makePretty($savings);
 	    print <<EOF
-    tz = new SimpleTimeZone
-      ($rawoffset, \"$name\",
-       $startmonth, $startday, $starttime,
-       $endmonth, $endday, $endtime, $savings);
+	tz = new SimpleTimeZone
+	  ($rawoffset, \"$name\",
+	  $startmonth, $startday, $starttime,
+	  $endmonth, $endday, $endtime, $savings);
 EOF
         }
     }
     for (@aliases) {
     print <<EOF
-    timezones.put(\"$_\", tz);
+	timezones0.put(\"$_\", tz);
 EOF
     }
 }
diff --git a/scripts/tzabbrevs b/scripts/tzabbrevs
index 73bb19047..f033f08ab 100644
--- a/scripts/tzabbrevs
+++ b/scripts/tzabbrevs
@@ -21,7 +21,7 @@ Link EST5EDT EST
 # XXX: Remove EST5EDT after java.lang.System is merged with libgcj?
 # Remove EST5EDT
 Link America/Anguilla PRT
-Link America/Buenos_Aires AGT
+Link America/Argentina/Buenos_Aires AGT
 Link America/St_Johns CNT
 Link CET ECT
 Link Africa/Cairo ART