2007-02-24  Jakub Jelinek  <jakub@redhat.com>

	* java/util/TimeZone.java (getDefaultDisplayName): Don't

	check if TimeZone is instanceof SimpleTimeZone.

2007-02-23  Jakub Jelinek  <jakub@redhat.com>

	PR libgcj/17002

	PR classpath/28550

	* java/lang/System.java: Add gnu.java.util.zoneinfo.dir to comments.

	* posix.cc (_Jv_platform_initProperties): Set

	gnu.java.util.zoneinfo.dir.

	* Makefile.am (ordinary_java_source_files): Add

	gnu/java/util/ZoneInfo.java.

	* Makefile.in: Regenerated.

	* java/util/Date.java (parse): Properly parse 09:01:02 as

	hours/minutes/seconds, not as hours/minutes/year.

	* java/util/SimpleTimeZone.java (getOffset): Handle properly

	millis + dstOffset overflowing into the next day.

	* java/util/TimeZone.java (zoneinfo_dir, availableIDs, aliases0): New

	static fields.

	(timezones): Remove synchronized keyword.  Set zoneinfo_dir.

	If non-null, set up aliases0 and don't put anything into

	timezones0.

	(defaultZone): Call getTZEnvVar to try TZ env var.

	Try to read /etc/localtime using ZoneInfo.readTZFile.

	Call getDefaultTimeZone instead of getTimeZone.

	(getDefaultTimeZone, getDateParams, parseTime): New private methods.

	(getTimeZoneInternal): New private method.

	(getTimeZone): Do the custom ID checking first, canonicalize

	ID for custom IDs as required by documentation.  Call

	getTimeZoneInternal to handle the rest.

	(getAvailableIDs(int)): Add locking.  Handle zoneinfo_dir != null.

	(getAvailableIDs(File,String,ArrayList)): New private method.

	(getAvailableIDs()): Add locking.  Handle zoneinfo_dir != null.

	(readSysconfigClockFile): New static method.

	(getTZEnvVar): New native method.

	* java/util/natTimeZone.cc: Include stdlib.h.

	(getTZEnvVar): New method.

	* gnu/java/util/ZoneInfo.java: New file.

	* java/util/GregorianCalendar.java

	(GregorianCalendar): Call clear before set in the constructors that

	don't initialize it to current time.

2007-02-09  Jakub Jelinek  <jakub@redhat.com>

	PR 23566

	* java/util/TimeZone.java (timezones): Regenerate from tzdata2007a.

2005-02-21  Jeroen Frijters  <jeroen@frijters.net>

	* java/util/GregorianCalendar.java

	(GregorianCalendar): Chained constructors to a (new)

	common constructor.

--- libjava/Makefile.am.jj	2006-10-05 00:38:22.000000000 +0200

+++ libjava/Makefile.am	2007-02-23 13:44:59.000000000 +0100

@@ -2382,6 +2382,7 @@ gnu/java/text/SentenceBreakIterator.java

 gnu/java/text/WordBreakIterator.java \

 gnu/java/util/DoubleEnumeration.java \

 gnu/java/util/EmptyEnumeration.java \

+gnu/java/util/ZoneInfo.java \

 gnu/java/util/prefs/MemoryBasedFactory.java \

 gnu/java/util/prefs/NodeReader.java \

 gnu/java/util/prefs/MemoryBasedPreferences.java \

--- libjava/Makefile.in.jj	2006-10-05 00:38:22.000000000 +0200

+++ libjava/Makefile.in	2007-02-23 13:46:07.000000000 +0100

@@ -2073,6 +2073,7 @@ gnu/java/text/SentenceBreakIterator.java

 gnu/java/text/WordBreakIterator.java \

 gnu/java/util/DoubleEnumeration.java \

 gnu/java/util/EmptyEnumeration.java \

+gnu/java/util/ZoneInfo.java \

 gnu/java/util/prefs/MemoryBasedFactory.java \

 gnu/java/util/prefs/NodeReader.java \

 gnu/java/util/prefs/MemoryBasedPreferences.java \

@@ -3331,6 +3332,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_D

 .deps/gnu/java/text/WordBreakIterator.P \

 .deps/gnu/java/util/DoubleEnumeration.P \

 .deps/gnu/java/util/EmptyEnumeration.P \

+.deps/gnu/java/util/ZoneInfo.P \

 .deps/gnu/java/util/prefs/FileBasedFactory.P \

 .deps/gnu/java/util/prefs/MemoryBasedFactory.P \

 .deps/gnu/java/util/prefs/MemoryBasedPreferences.P \

--- libjava/java/util/GregorianCalendar.java.jj	2006-10-05 00:38:18.000000000 +0200

+++ libjava/java/util/GregorianCalendar.java	2007-02-23 19:30:20.000000000 +0100

@@ -121,6 +121,13 @@ public class GregorianCalendar extends C

     this(TimeZone.getDefault(), locale);

   }

+  private GregorianCalendar(TimeZone zone, Locale locale, boolean unused)

+  {

+    super(zone, locale);

+    ResourceBundle rb = getBundle(locale);

+    gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime();

+  }

+

   /**

    * Constructs a new GregorianCalender representing the current

    * time with the given time zone and the given locale.

@@ -129,9 +136,7 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(TimeZone zone, Locale locale)

   {

-    super(zone, locale);

-    ResourceBundle rb = getBundle(locale);

-    gregorianCutover = ((Date) rb.getObject("gregorianCutOver")).getTime();

+    this(zone, locale, false);

     setTimeInMillis(System.currentTimeMillis());

   }

@@ -144,7 +149,8 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(int year, int month, int day)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day);

   }

@@ -159,7 +165,8 @@ public class GregorianCalendar extends C

    */

   public GregorianCalendar(int year, int month, int day, int hour, int minute)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day, hour, minute);

   }

@@ -176,7 +183,8 @@ public class GregorianCalendar extends C

   public GregorianCalendar(int year, int month, int day,

 			   int hour, int minute, int second)

   {

-    super();

+    this(TimeZone.getDefault(), Locale.getDefault(), false);

+    clear();

     set(year, month, day, hour, minute, second);

   }

--- libjava/java/util/SimpleTimeZone.java.jj	2006-10-05 00:38:18.000000000 +0200

+++ libjava/java/util/SimpleTimeZone.java	2007-02-23 14:38:01.000000000 +0100

@@ -460,16 +460,34 @@ public class SimpleTimeZone extends Time

     int daylightSavings = 0;

     if (useDaylight && era == GregorianCalendar.AD && year >= startYear)

       {

+	int orig_year = year;

 	// This does only work for Gregorian calendars :-(

 	// This is mainly because setStartYear doesn't take an era.

 	boolean afterStart = !isBefore(year, month, day, dayOfWeek, millis,

 				       startMode, startMonth,

 				       startDay, startDayOfWeek, startTime);

+	millis += dstSavings;

+	if (millis >= 24 * 60 * 60 * 1000)

+	  {

+	    millis -= 24 * 60 * 60 * 1000;

+	    dayOfWeek = (dayOfWeek % 7) + 1;

+	    if (++day > getDaysInMonth(month, year))

+	      {

+		day = 1;

+		if (month++ == Calendar.DECEMBER)

+		  {

+		    month = Calendar.JANUARY;

+		    year++;

+		  }

+	      }

+	  }

 	boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis,

 				     endMode, endMonth,

 				     endDay, endDayOfWeek, endTime);

+	if (orig_year != year)

+	  afterStart = false;

 	if (startMonth < endMonth)

 	  {

 	    // use daylight savings, if the date is after the start of

--- libjava/java/util/Date.java.jj	2006-10-05 00:38:18.000000000 +0200

+++ libjava/java/util/Date.java	2007-02-23 14:38:01.000000000 +0100

@@ -411,6 +411,7 @@ public class Date implements Cloneable, 

 	  }

 	else if (firstch >= '0' && firstch <= '9')

 	  {

+	    int lastPunct = -1;

 	    while (tok != null && tok.length() > 0)

 	      {

 		int punctOffset = tok.length();

@@ -448,6 +449,13 @@ public class Date implements Cloneable, 

 		    else

 		      minute = num;

 		  }

+		else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0))

+		  {

+		    if (minute < 0)

+		      minute = num;

+		    else

+		      second = num;

+		  }

 	        else if ((num >= 70

 			  && (punct == ' ' || punct == ','

 			      || punct == '/' || punct < 0))

@@ -486,6 +494,7 @@ public class Date implements Cloneable, 

 		  tok = null;

 		else

 		  tok = tok.substring(punctOffset + 1);

+		lastPunct = punct;

 	      }

 	  }

 	else if (firstch >= 'A' && firstch <= 'Z')

--- libjava/java/util/natTimeZone.cc.jj	2006-10-05 00:38:18.000000000 +0200

+++ libjava/java/util/natTimeZone.cc	2007-02-23 15:14:38.000000000 +0100

@@ -18,6 +18,7 @@ details.  */

 #include <java/lang/Character.h>

 #include <java/lang/Integer.h>

+#include <stdlib.h>

 #include <stdio.h>

 #if TIME_WITH_SYS_TIME

@@ -168,3 +169,12 @@ java::util::TimeZone::getDefaultTimeZone

   // If all else fails, return null.

   return NULL;

 }

+

+jstring

+java::util::TimeZone::getTZEnvVar ()

+{

+  const char *tzenv = ::getenv ("TZ");

+  if (tzenv == NULL)

+    return NULL;

+  return JvNewStringUTF (tzenv);

+}

--- libjava/java/util/TimeZone.java.jj	2006-10-05 00:38:18.000000000 +0200

+++ libjava/java/util/TimeZone.java	2007-02-23 15:10:51.000000000 +0100

@@ -38,8 +38,15 @@ exception statement from your version. *

 package java.util;

-import java.text.DateFormatSymbols;

 import gnu.classpath.Configuration;

+import gnu.java.util.ZoneInfo;

+import java.io.BufferedInputStream;

+import java.io.BufferedReader;

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.InputStreamReader;

+import java.io.IOException;

+import java.text.DateFormatSymbols;

 /**

  * This class represents a time zone offset and handles daylight savings.

@@ -94,14 +101,72 @@ public abstract class TimeZone implement

 	    System.loadLibrary("javautil");

 	  }

 	String tzid = System.getProperty("user.timezone");

-	

+

+	if (tzid == null)

+	  {

+	    tzid = getTZEnvVar();

+	    if (tzid != null && tzid.equals(""))

+	      tzid = null;

+	  }

+

+	if (tzid == null)

+	  {

+	    TimeZone zone = ZoneInfo.readTZFile((String) null, "/etc/localtime");

+	    if (zone != null)

+	      {

+		// Try to find a more suitable ID for the /etc/localtime

+		// timezone.

+		// Sometimes /etc/localtime is a symlink to some

+		// /usr/share/zoneinfo/ file.

+		String id = null;

+		try

+		  {

+		    id = new File("/etc/localtime").getCanonicalPath();

+		    if (id != null)

+		      {

+			String zoneinfo_dir

+			  = System.getProperty("gnu.java.util.zoneinfo.dir");

+			if (zoneinfo_dir != null)

+			  zoneinfo_dir

+			    = new File(zoneinfo_dir

+				       + File.separatorChar).getCanonicalPath();

+			if (zoneinfo_dir != null && id.startsWith(zoneinfo_dir))

+			  {

+			    int pos = zoneinfo_dir.length();

+			    while (pos < id.length()

+				   && id.charAt(pos) == File.separatorChar)

+			      pos++;

+			    if (pos < id.length())

+			      id = id.substring(pos);

+			    else

+			      id = null;

+			  }

+			else

+			  id = null;

+		      }

+		  }

+		catch (IOException ioe)

+		  {

+		    id = null;

+		  }

+

+		if (id == null)

+		  id = readSysconfigClockFile("/etc/sysconfig/clock");

+

+		if (id != null)

+		  zone.setID(id);

+		defaultZone0 = zone;

+		return defaultZone0;

+	      }

+	  }

+

 	if (tzid == null)

 	  tzid = getDefaultTimeZoneId();

 	if (tzid == null)

 	  tzid = "GMT";

-	defaultZone0 = getTimeZone(tzid);

+	defaultZone0 = getDefaultTimeZone(tzid);

       }

     return defaultZone0; 

   }

@@ -110,18 +175,76 @@ public abstract class TimeZone implement

   private static final long serialVersionUID = 3581463369166924961L;

   /**

-   * Hashtable for timezones by ID.  

+   * Flag whether zoneinfo data should be used,

+   * otherwise builtin timezone data will be provided.

+   */

+  private static String zoneinfo_dir;

+

+  /**

+   * Cached copy of getAvailableIDs().

+   */

+  private static String[] availableIDs = null;

+

+  /**

+   * JDK 1.1.x compatibility aliases.

+   */

+  private static Hashtable aliases0;

+

+  /**

+   * Hashtable for timezones by ID.

    */

   private static Hashtable timezones0;

   /* initialize this static field lazily to overhead if

    * it is not needed: 

    */

-  private static synchronized Hashtable timezones() {

+  private static Hashtable timezones() {

     if (timezones0==null) 

       {

 	Hashtable timezones = new Hashtable();

 	timezones0 = timezones;

+	zoneinfo_dir = System.getProperty("gnu.java.util.zoneinfo.dir");

+	if (zoneinfo_dir != null && !new File(zoneinfo_dir).isDirectory())

+	  zoneinfo_dir = null;

+

+	if (zoneinfo_dir != null)

+	  {

+	    aliases0 = new Hashtable();

+

+	    // These deprecated aliases for JDK 1.1.x compatibility

+	    // should take precedence over data files read from

+	    // /usr/share/zoneinfo.

+	    aliases0.put("ACT", "Australia/Darwin");

+	    aliases0.put("AET", "Australia/Sydney");

+	    aliases0.put("AGT", "America/Argentina/Buenos_Aires");

+	    aliases0.put("ART", "Africa/Cairo");

+	    aliases0.put("AST", "America/Juneau");

+	    aliases0.put("BST", "Asia/Colombo");

+	    aliases0.put("CAT", "Africa/Gaborone");

+	    aliases0.put("CNT", "America/St_Johns");

+	    aliases0.put("CST", "CST6CDT");

+	    aliases0.put("CTT", "Asia/Brunei");

+	    aliases0.put("EAT", "Indian/Comoro");

+	    aliases0.put("ECT", "CET");

+	    aliases0.put("EST", "EST5EDT");

+	    aliases0.put("EST5", "EST5EDT");

+	    aliases0.put("IET", "EST5EDT");

+	    aliases0.put("IST", "Asia/Calcutta");

+	    aliases0.put("JST", "Asia/Seoul");

+	    aliases0.put("MIT", "Pacific/Niue");

+	    aliases0.put("MST", "MST7MDT");

+	    aliases0.put("MST7", "MST7MDT");

+	    aliases0.put("NET", "Indian/Mauritius");

+	    aliases0.put("NST", "Pacific/Auckland");

+	    aliases0.put("PLT", "Indian/Kerguelen");

+	    aliases0.put("PNT", "MST7MDT");

+	    aliases0.put("PRT", "America/Anguilla");

+	    aliases0.put("PST", "PST8PDT");

+	    aliases0.put("SST", "Pacific/Ponape");

+	    aliases0.put("VST", "Asia/Bangkok");

+	    return timezones;

+	  }

+

 	TimeZone tz;

 	// Automatically generated by scripts/timezones.pl

 	// XXX - Should we read this data from a file?

@@ -133,8 +256,8 @@ public abstract class TimeZone implement

 	timezones0.put("Pacific/Pago_Pago", tz);

 	tz = new SimpleTimeZone

 	  (-10000 * 3600, "America/Adak",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("America/Adak", tz);

 	tz = new SimpleTimeZone(-10000 * 3600, "HST");

 	timezones0.put("HST", tz);

@@ -147,8 +270,8 @@ public abstract class TimeZone implement

 	timezones0.put("Pacific/Marquesas", tz);

 	tz = new SimpleTimeZone

 	  (-9000 * 3600, "AST",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("AST", tz);

 	timezones0.put("America/Anchorage", tz);

 	timezones0.put("America/Juneau", tz);

@@ -157,33 +280,29 @@ public abstract class TimeZone implement

 	tz = new SimpleTimeZone(-9000 * 3600, "Pacific/Gambier");

 	timezones0.put("Pacific/Gambier", tz);

 	tz = new SimpleTimeZone

-	  (-8000 * 3600, "PST",

+	  (-8000 * 3600, "America/Tijuana",

 	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

 	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

+	timezones0.put("America/Tijuana", tz);

+	tz = new SimpleTimeZone

+	  (-8000 * 3600, "PST",

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("PST", tz);

 	timezones0.put("PST8PDT", tz);

 	timezones0.put("America/Dawson", tz);

 	timezones0.put("America/Los_Angeles", tz);

-	timezones0.put("America/Tijuana", tz);

 	timezones0.put("America/Vancouver", tz);

 	timezones0.put("America/Whitehorse", tz);

 	timezones0.put("US/Pacific-New", tz);

 	tz = new SimpleTimeZone(-8000 * 3600, "Pacific/Pitcairn");

 	timezones0.put("Pacific/Pitcairn", tz);

 	tz = new SimpleTimeZone

-	  (-7000 * 3600, "MST",

+	  (-7000 * 3600, "America/Chihuahua",

 	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

 	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

-	timezones0.put("MST", tz);

-	timezones0.put("MST7MDT", tz);

-	timezones0.put("America/Boise", tz);

 	timezones0.put("America/Chihuahua", tz);

-	timezones0.put("America/Denver", tz);

-	timezones0.put("America/Edmonton", tz);

-	timezones0.put("America/Inuvik", tz);

 	timezones0.put("America/Mazatlan", tz);

-	timezones0.put("America/Shiprock", tz);

-	timezones0.put("America/Yellowknife", tz);

 	tz = new SimpleTimeZone(-7000 * 3600, "MST7");

 	timezones0.put("MST7", tz);

 	timezones0.put("PNT", tz);

@@ -191,20 +310,26 @@ public abstract class TimeZone implement

 	timezones0.put("America/Hermosillo", tz);

 	timezones0.put("America/Phoenix", tz);

 	tz = new SimpleTimeZone

-	  (-6000 * 3600, "CST",

+	  (-7000 * 3600, "MST",

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

+	timezones0.put("MST", tz);

+	timezones0.put("MST7MDT", tz);

+	timezones0.put("America/Boise", tz);

+	timezones0.put("America/Cambridge_Bay", tz);

+	timezones0.put("America/Denver", tz);

+	timezones0.put("America/Edmonton", tz);

+	timezones0.put("America/Inuvik", tz);

+	timezones0.put("America/Shiprock", tz);

+	timezones0.put("America/Yellowknife", tz);

+	tz = new SimpleTimeZone

+	  (-6000 * 3600, "America/Cancun",

 	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

 	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

-	timezones0.put("CST", tz);

-	timezones0.put("CST6CDT", tz);

-	timezones0.put("America/Cambridge_Bay", tz);

 	timezones0.put("America/Cancun", tz);

-	timezones0.put("America/Chicago", tz);

-	timezones0.put("America/Menominee", tz);

 	timezones0.put("America/Merida", tz);

 	timezones0.put("America/Mexico_City", tz);

 	timezones0.put("America/Monterrey", tz);

-	timezones0.put("America/Rainy_River", tz);

-	timezones0.put("America/Winnipeg", tz);

 	tz = new SimpleTimeZone(-6000 * 3600, "America/Belize");

 	timezones0.put("America/Belize", tz);

 	timezones0.put("America/Costa_Rica", tz);

@@ -216,57 +341,81 @@ public abstract class TimeZone implement

 	timezones0.put("America/Tegucigalpa", tz);

 	timezones0.put("Pacific/Galapagos", tz);

 	tz = new SimpleTimeZone

+	  (-6000 * 3600, "CST",

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

+	timezones0.put("CST", tz);

+	timezones0.put("CST6CDT", tz);

+	timezones0.put("America/Chicago", tz);

+	timezones0.put("America/Indiana/Knox", tz);

+	timezones0.put("America/Indiana/Petersburg", tz);

+	timezones0.put("America/Indiana/Vincennes", tz);

+	timezones0.put("America/Menominee", tz);

+	timezones0.put("America/North_Dakota/Center", tz);

+	timezones0.put("America/North_Dakota/New_Salem", tz);

+	timezones0.put("America/Rainy_River", tz);

+	timezones0.put("America/Rankin_Inlet", tz);

+	timezones0.put("America/Winnipeg", tz);

+	tz = new SimpleTimeZone

 	  (-6000 * 3600, "Pacific/Easter",

-	   Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,

-	   Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);

+	   Calendar.OCTOBER, 2, Calendar.SATURDAY, 22000 * 3600,

+	   Calendar.MARCH, 2, Calendar.SATURDAY, 22000 * 3600);

 	timezones0.put("Pacific/Easter", tz);

-	tz = new SimpleTimeZone

-	  (-5000 * 3600, "America/Grand_Turk",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);

-	timezones0.put("America/Grand_Turk", tz);

-	timezones0.put("America/Havana", tz);

 	tz = new SimpleTimeZone(-5000 * 3600, "EST5");

 	timezones0.put("EST5", tz);

 	timezones0.put("IET", tz);

+	timezones0.put("America/Atikokan", tz);

 	timezones0.put("America/Bogota", tz);

 	timezones0.put("America/Cayman", tz);

 	timezones0.put("America/Eirunepe", tz);

 	timezones0.put("America/Guayaquil", tz);

-	timezones0.put("America/Indiana/Indianapolis", tz);

-	timezones0.put("America/Indiana/Knox", tz);

-	timezones0.put("America/Indiana/Marengo", tz);

-	timezones0.put("America/Indiana/Vevay", tz);

-	timezones0.put("America/Indianapolis", tz);

-	timezones0.put("America/Iqaluit", tz);

 	timezones0.put("America/Jamaica", tz);

 	timezones0.put("America/Lima", tz);

 	timezones0.put("America/Panama", tz);

-	timezones0.put("America/Pangnirtung", tz);

+	timezones0.put("America/Rio_Branco", tz);

+	tz = new SimpleTimeZone

+	  (-5000 * 3600, "America/Havana",

+	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,

+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);

+	timezones0.put("America/Havana", tz);

+	tz = new SimpleTimeZone

+	  (-5000 * 3600, "America/Grand_Turk",

+	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,

+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);

+	timezones0.put("America/Grand_Turk", tz);

 	timezones0.put("America/Port-au-Prince", tz);

-	timezones0.put("America/Porto_Acre", tz);

-	timezones0.put("America/Rankin_Inlet", tz);

 	tz = new SimpleTimeZone

 	  (-5000 * 3600, "EST",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("EST", tz);

 	timezones0.put("EST5EDT", tz);

 	timezones0.put("America/Detroit", tz);

+	timezones0.put("America/Indiana/Indianapolis", tz);

+	timezones0.put("America/Indiana/Marengo", tz);

+	timezones0.put("America/Indiana/Vevay", tz);

+	timezones0.put("America/Iqaluit", tz);

 	timezones0.put("America/Kentucky/Louisville", tz);

 	timezones0.put("America/Kentucky/Monticello", tz);

-	timezones0.put("America/Louisville", tz);

 	timezones0.put("America/Montreal", tz);

 	timezones0.put("America/Nassau", tz);

 	timezones0.put("America/New_York", tz);

 	timezones0.put("America/Nipigon", tz);

+	timezones0.put("America/Pangnirtung", tz);

 	timezones0.put("America/Thunder_Bay", tz);

+	timezones0.put("America/Toronto", tz);

+	tz = new SimpleTimeZone

+	  (-4000 * 3600, "America/Asuncion",

+	   Calendar.OCTOBER, 3, Calendar.SUNDAY, 0 * 3600,

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 0 * 3600);

+	timezones0.put("America/Asuncion", tz);

 	tz = new SimpleTimeZone(-4000 * 3600, "PRT");

 	timezones0.put("PRT", tz);

 	timezones0.put("America/Anguilla", tz);

 	timezones0.put("America/Antigua", tz);

 	timezones0.put("America/Aruba", tz);

 	timezones0.put("America/Barbados", tz);

+	timezones0.put("America/Blanc-Sablon", tz);

 	timezones0.put("America/Boa_Vista", tz);

 	timezones0.put("America/Caracas", tz);

 	timezones0.put("America/Curacao", tz);

@@ -288,26 +437,23 @@ public abstract class TimeZone implement

 	timezones0.put("America/St_Vincent", tz);

 	timezones0.put("America/Tortola", tz);

 	tz = new SimpleTimeZone

-	  (-4000 * 3600, "America/Asuncion",

-	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 0 * 3600,

+	  (-4000 * 3600, "America/Campo_Grande",

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,

 	   Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);

-	timezones0.put("America/Asuncion", tz);

-	tz = new SimpleTimeZone

-	  (-4000 * 3600, "America/Cuiaba",

-	   Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,

-	   Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);

+	timezones0.put("America/Campo_Grande", tz);

 	timezones0.put("America/Cuiaba", tz);

 	tz = new SimpleTimeZone

 	  (-4000 * 3600, "America/Goose_Bay",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 60000,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 60000,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);

 	timezones0.put("America/Goose_Bay", tz);

 	tz = new SimpleTimeZone

 	  (-4000 * 3600, "America/Glace_Bay",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("America/Glace_Bay", tz);

 	timezones0.put("America/Halifax", tz);

+	timezones0.put("America/Moncton", tz);

 	timezones0.put("America/Thule", tz);

 	timezones0.put("Atlantic/Bermuda", tz);

 	tz = new SimpleTimeZone

@@ -318,58 +464,67 @@ public abstract class TimeZone implement

 	timezones0.put("Antarctica/Palmer", tz);

 	tz = new SimpleTimeZone

 	  (-4000 * 3600, "Atlantic/Stanley",

-	   Calendar.SEPTEMBER, 2, Calendar.SUNDAY, 0 * 3600,

-	   Calendar.APRIL, 16, -Calendar.SUNDAY, 0 * 3600);

+	   Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.APRIL, 3, Calendar.SUNDAY, 2000 * 3600);

 	timezones0.put("Atlantic/Stanley", tz);

 	tz = new SimpleTimeZone

 	  (-3500 * 3600, "CNT",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 60000,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 60000,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);

 	timezones0.put("CNT", tz);

 	timezones0.put("America/St_Johns", tz);

 	tz = new SimpleTimeZone

-	  (-3000 * 3600, "America/Araguaina",

-	   Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,

-	   Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);

-	timezones0.put("America/Araguaina", tz);

+	  (-3000 * 3600, "America/Godthab",

+	   Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,

+	   Calendar.OCTOBER, 30, -Calendar.SATURDAY, 23000 * 3600);

+	timezones0.put("America/Godthab", tz);

+	tz = new SimpleTimeZone

+	  (-3000 * 3600, "America/Miquelon",

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);

+	timezones0.put("America/Miquelon", tz);

+	tz = new SimpleTimeZone

+	  (-3000 * 3600, "America/Montevideo",

+	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,

+	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600);

+	timezones0.put("America/Montevideo", tz);

+	tz = new SimpleTimeZone

+	  (-3000 * 3600, "America/Sao_Paulo",

+	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,

+	   Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);

 	timezones0.put("America/Sao_Paulo", tz);

 	tz = new SimpleTimeZone(-3000 * 3600, "AGT");

 	timezones0.put("AGT", tz);

+	timezones0.put("America/Araguaina", tz);

+	timezones0.put("America/Argentina/Buenos_Aires", tz);

+	timezones0.put("America/Argentina/Catamarca", tz);

+	timezones0.put("America/Argentina/Cordoba", tz);

+	timezones0.put("America/Argentina/Jujuy", tz);

+	timezones0.put("America/Argentina/La_Rioja", tz);

+	timezones0.put("America/Argentina/Mendoza", tz);

+	timezones0.put("America/Argentina/Rio_Gallegos", tz);

+	timezones0.put("America/Argentina/San_Juan", tz);

+	timezones0.put("America/Argentina/Tucuman", tz);

+	timezones0.put("America/Argentina/Ushuaia", tz);

+	timezones0.put("America/Bahia", tz);

 	timezones0.put("America/Belem", tz);

-	timezones0.put("America/Buenos_Aires", tz);

-	timezones0.put("America/Catamarca", tz);

 	timezones0.put("America/Cayenne", tz);

-	timezones0.put("America/Cordoba", tz);

 	timezones0.put("America/Fortaleza", tz);

-	timezones0.put("America/Jujuy", tz);

 	timezones0.put("America/Maceio", tz);

-	timezones0.put("America/Mendoza", tz);

-	timezones0.put("America/Montevideo", tz);

 	timezones0.put("America/Paramaribo", tz);

 	timezones0.put("America/Recife", tz);

-	timezones0.put("America/Rosario", tz);

-	tz = new SimpleTimeZone

-	  (-3000 * 3600, "America/Godthab",

-	   Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,

-	   Calendar.OCTOBER, 30, -Calendar.SATURDAY, 22000 * 3600);

-	timezones0.put("America/Godthab", tz);

-	tz = new SimpleTimeZone

-	  (-3000 * 3600, "America/Miquelon",

-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,

-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);

-	timezones0.put("America/Miquelon", tz);

+	timezones0.put("Antarctica/Rothera", tz);