r1352 - in glibc-package/trunk/debian: . control.in patches patches/all
Author: aurel32
Date: 2006-04-08 19:53:46 +0000 (Sat, 08 Apr 2006)
New Revision: 1352
Removed:
glibc-package/trunk/debian/patches/all/cvs-tzdata.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/rules
Log:
+ * Remove the timezone database from the libc6 package. It is not provided
+ by a separate package called tzdata.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/changelog 2006-04-08 19:53:46 UTC (rev 1352)
@@ -1,8 +1,8 @@
glibc (2.3.6-6) UNRELEASED; urgency=low
[ Aurelien Jarno ]
- * Split out timezone data in a separate package. It's a first step, it
- should finally be built from a separate source package.
+ * Remove the timezone database from the libc6 package. It is not provided
+ by a separate package called tzdata.
* Split out binaries from libc6 into libc-bin, and binaries from libc6-bin
into libc-bin-dev. (Closes: #330735)
* Put each test log file in the corresponding package instead of putting all
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/control 2006-04-08 19:53:46 UTC (rev 1352)
@@ -63,16 +63,6 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
-Package: tzdata
-Architecture: all
-Section: libs
-Priority: required
-Depends: libc-bin (>= ${Source-Version})
-Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: GNU C Library: Timezone data
- This package contains data files with rules for various timezones around
- the world.
-
Package: nscd
Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/control.in/main 2006-04-08 19:53:46 UTC (rev 1352)
@@ -63,25 +63,6 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
-Package: tzdata
-Architecture: all
-Section: libs
-Priority: required
-Depends: libc-bin (>= ${Source-Version})
-Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: GNU C Library: Timezone data
- This package contains data files with rules for various timezones around
- the world.
-
-Package: tzdata
-Architecture: all
-Section: libs
-Priority: required
-Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: GNU C Library: Timezone data
- This package contains data files with rules for various timezones around
- the world.
-
Package: nscd
Architecture: @threads_archs@
Section: admin
Deleted: glibc-package/trunk/debian/patches/all/cvs-tzdata.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/cvs-tzdata.diff 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/patches/all/cvs-tzdata.diff 2006-04-08 19:53:46 UTC (rev 1352)
@@ -1,1658 +0,0 @@
-# DP: Description: Timezone update.
-# DP: Related bugs:
-# DP: Dpatch author: Denis Barbier <barbier@debian.org>
-# DP: Patch author: Various
-# DP: Upstream status: In CVS
-# DP: Status Details: updated to ftp://elsie.nci.nih.gov/pub/tzdata2006B.tar.gz
-# DP: Date: 2006-03-17
-
-Index: timezone/africa
-===================================================================
---- timezone/africa.orig
-+++ timezone/africa
-@@ -1,4 +1,5 @@
--# @(#)africa 7.39
-+# @(#)africa 8.1
-+# <pre>
-
- # This data is by no means authoritative; if you think you know better,
- # go ahead and edit the file (and please send any changes to
-Index: timezone/antarctica
-===================================================================
---- timezone/antarctica.orig
-+++ timezone/antarctica
-@@ -1,4 +1,5 @@
--# @(#)antarctica 7.25
-+# @(#)antarctica 8.1
-+# <pre>
-
- # From Paul Eggert (1999-11-15):
- # To keep things manageable, we list only locations occupied year-round; see
-@@ -59,7 +60,7 @@
- # Australia - territories
- # Heard Island, McDonald Islands (uninhabited)
- # previously sealers and scientific personnel wintered
--# <a href="http://www.dstc.qut.edu.au/DST/marg/daylight.html";>
-+# <a href="http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html";>
- # Margaret Turner reports
- # </a> (1999-09-30) that they're UTC+5, with no DST;
- # presumably this is when they have visitors.
-@@ -106,7 +107,7 @@
-
- # France - year-round bases
- #
--# From Antoine Leca <Antoine.Leca@Renault.FR> (1997-01-20):
-+# From Antoine Leca (1997-01-20):
- # Time data are from Nicole Pailleau at the IFRTP
- # (French Institute for Polar Research and Technology).
- # She confirms that French Southern Territories and Terre Adelie bases
-@@ -139,11 +140,10 @@
- 0 - zzz 1956 Nov
- 10:00 - DDUT # Dumont-d'Urville Time
- # Reference:
--# <a href="http://www.icair.iac.org.nz/science/reports/fr/IFRTP.html";>
--# Support and Development of Polar Research and Technology (1997-02-03)
-+# <a href="http://en.wikipedia.org/wiki/Dumont_d'Urville_Station">
-+# Dumont d'Urville Station (2005-12-05)
- # </a>
-
--
- # Germany - year-round base
- # Georg von Neumayer, -7039-00815
-
-@@ -155,9 +155,7 @@
- # Syowa, -690022+0393524
- #
- # From Hideyuki Suzuki (1999-02-06):
--# In all Japanese stations, +0300 is used as the standard time. [See]
--# <a href="http://www.crl.go.jp/uk/uk201/basyo.htm";>[reference in Japanese]</a>
--# and information from KAMO Hiroyasu.
-+# In all Japanese stations, +0300 is used as the standard time.
- #
- # Syowa station, which is the first antarctic station of Japan,
- # was established on 1957-01-29. Since Syowa station is still the main
-@@ -296,7 +294,7 @@
- # Normally it wouldn't have a separate entry, since it's like the
- # larger Antarctica/McMurdo since 1970, but it's too famous to omit.
- #
--# From Chris Carrier <72157.3334@CompuServe.COM> (1996-06-27):
-+# From Chris Carrier (1996-06-27):
- # Siple, the first commander of the South Pole station,
- # stated that he would have liked to have kept GMT at the station,
- # but that he found it more convenient to keep GMT+12
-Index: timezone/asia
-===================================================================
---- timezone/asia.orig
-+++ timezone/asia
-@@ -1,4 +1,5 @@
--# @(#)asia 7.85
-+# @(#)asia 8.1
-+# <pre>
-
- # This data is by no means authoritative; if you think you know better,
- # go ahead and edit the file (and please send any changes to
-@@ -85,7 +86,7 @@
- # Shanks has Yerevan switching to 3:00 (with Russian DST) in spring 1991,
- # then to 4:00 with no DST in fall 1995, then readopting Russian DST in 1997.
- # Go with Shanks, even when he disagrees with others. Edgar Der-Danieliantz
--# <edd@AIC.NET> reported (1996-05-04) that Yerevan probably wouldn't use DST
-+# reported (1996-05-04) that Yerevan probably wouldn't use DST
- # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that
- # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991,
- # but started switching at 3:00s in 1998.
-@@ -99,9 +100,12 @@
- 4:00 RussiaAsia AM%sT
-
- # Azerbaijan
-+# From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
-+# According to the resolution of Cabinet of Ministers, 1997
-+# Resolution available at: http://aif.az/docs/daylight_res.pdf
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Azer 1997 max - Mar lastSun 1:00 1:00 S
--Rule Azer 1997 max - Oct lastSun 1:00 0 -
-+Rule Azer 1997 max - Mar lastSun 4:00 1:00 S
-+Rule Azer 1997 max - Oct lastSun 5:00 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Baku 3:19:24 - LMT 1924 May 2
- 3:00 - BAKT 1957 Mar # Baku Time
-@@ -348,6 +352,17 @@
- # Mikhail Saakashvili, who said the change was partly prompted by the process
- # of integration into Europe.
-
-+# From Teimuraz Abashidze (2005-11-07):
-+# Government of Georgia ... decided to NOT CHANGE daylight savings time on
-+# [Oct.] 30, as it was done before during last more than 10 years.
-+# Currently, we are in fact GMT +4:00, as before 30 October it was GMT
-+# +3:00.... The problem is, there is NO FORMAL LAW or governmental document
-+# about it. As far as I can find, I was told, that there is no document,
-+# because we just DIDN'T ISSUE document about switching to winter time....
-+# I don't know what can be done, especially knowing that some years ago our
-+# DST rules where changed THREE TIMES during one month.
-+
-+
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Tbilisi 2:59:16 - LMT 1880
- 2:59:16 - TBMT 1924 May 2 # Tbilisi Mean Time
-@@ -359,7 +374,8 @@
- 4:00 E-EurAsia GE%sT 1996 Oct lastSun
- 4:00 1:00 GEST 1997 Mar lastSun
- 4:00 E-EurAsia GE%sT 2004 Jun 27
-- 3:00 RussiaAsia GE%sT
-+ 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00
-+ 4:00 - GET
-
- # East Timor
-
-@@ -915,6 +931,13 @@
- # The decision was taken because of the increase in working hours in
- # government's departments from six to seven hours.
- #
-+# From Paul Eggert (2005-11-22):
-+# Starting 2003 transitions are from Steffen Thorsen's web site timeanddate.com.
-+#
-+# From Steffen Thorsen (2005-11-23):
-+# For Jordan I have received multiple independent user reports every year
-+# about DST end dates, as the end-rule is different every year.
-+#
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
-@@ -937,8 +960,11 @@
- Rule Jordan 1994 only - Sep Fri>=15 0:00 0 -
- Rule Jordan 1995 1998 - Sep Fri>=15 0:00s 0 -
- Rule Jordan 1999 only - Jul 1 0:00s 1:00 S
--Rule Jordan 1999 max - Sep lastThu 0:00s 0 -
-+Rule Jordan 1999 2002 - Sep lastThu 0:00s 0 -
- Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S
-+Rule Jordan 2003 only - Oct 24 0:00s 0 -
-+Rule Jordan 2004 only - Oct 15 0:00s 0 -
-+Rule Jordan 2005 max - Sep lastFri 0:00s 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Amman 2:23:44 - LMT 1931
- 2:00 Jordan EE%sT
-@@ -1044,18 +1070,22 @@
- # <http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml>
- # Kyrgyzstan is canceling the daylight saving time system. I take the article
- # to mean that they will leave their clocks at 6 hours ahead of UTC.
-+# From Malik Abdugaliev (2005-09-21):
-+# Our government cancels daylight saving time 6th of August 2005.
-+# From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Kirgiz 1992 1996 - Apr Sun>=7 0:00s 1:00 S
--Rule Kirgiz 1992 1996 - Sep lastSun 0:00 0 -
--Rule Kirgiz 1997 max - Mar lastSun 2:30 1:00 S
--Rule Kirgiz 1997 max - Oct lastSun 2:30 0 -
-+Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 S
-+Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
-+Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 S
-+Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2
- 5:00 - FRUT 1930 Jun 21 # Frunze Time
- 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s
- 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence
-- 5:00 Kirgiz KG%sT # Kirgizstan Time
-+ 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time
-+ 6:00 - KGT
-
- ###############################################################################
-
-@@ -1404,6 +1434,15 @@
- # For now, let's assume that the spring switch was at 24:00,
- # and that they switch at 0:00 on the 3rd Fridays of April and October.
-
-+# From Paul Eggert (2005-11-22):
-+# Starting 2004 transitions are from Steffen Thorsen's web site timeanddate.com.
-+
-+# From Steffen Thorsen (2005-11-23):
-+# A user from Gaza reported that Gaza made the change early because of
-+# the Ramadan. Next year Ramadan will be even earlier, so I think
-+# there is a good chance next year's end date will be around two weeks
-+# earlier--the same goes for Jordan.
-+
- # The rules for Egypt are stolen from the `africa' file.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
-@@ -1414,7 +1453,9 @@
- Rule EgyptAsia 1966 only - Oct 1 3:00 0 -
-
- Rule Palestine 1999 max - Apr Fri>=15 0:00 1:00 S
--Rule Palestine 1999 max - Oct Fri>=15 0:00 0 -
-+Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 -
-+Rule Palestine 2004 only - Oct 1 1:00 0 -
-+Rule Palestine 2005 max - Oct 4 2:00 0 -
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
-Index: timezone/australasia
-===================================================================
---- timezone/australasia.orig
-+++ timezone/australasia
-@@ -1,4 +1,6 @@
--# @(#)australasia 7.73
-+# @(#)australasia 8.1
-+# <pre>
-+
- # This file also includes Pacific islands.
-
- # Notes are at the end of this file
-@@ -551,9 +553,15 @@
-
- # Australia
-
--# <a href="http://www.dstc.qut.edu.au/DST/marg/daylight.html";>
--# Australia's Daylight Saving Times
--# </a>, by Margaret Turner, summarizes daylight saving issues in Australia.
-+# From Paul Eggert (2005-12-08):
-+# <a href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml";>
-+# Implementation Dates of Daylight Saving Time within Australia
-+# </a> summarizes daylight saving issues in Australia.
-+
-+# From Arthur David Olson (2005-12-12):
-+# <a href="http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving";>
-+# Lawlink NSW:Daylight Saving in New South Wales
-+# </a> covers New South Wales in particular.
-
- # From John Mackin (1991-03-06):
- # We in Australia have _never_ referred to DST as `daylight' time.
-@@ -960,17 +968,6 @@
- # legislation. This is very important to understand.
- # I have researched New South Wales time only...
-
--# From Paul Eggert (1999-09-27):
--# The Information Service of the Australian National Standards Commission
--# <a href="http://www.nsc.gov.au/InfoServ/Ileaflet/il27.htm";>
--# Daylight Saving
--# </a> page (1995-04) has an excellent overall history of Australian DST.
--# The Community Relations Division of the NSW Attorney General's Department
--# publishes a history of daylight saving in NSW. See:
--# <a href="http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2";>
--# Lawlink NSW: Daylight Saving in New South Wales
--# </a>
--
- # From Eric Ulevik (1999-05-26):
- # DST will start in NSW on the last Sunday of August, rather than the usual
- # October in 2000. [See: Matthew Moore,
-@@ -1048,7 +1045,7 @@
- # Lord Howe Island
-
- # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
--# LHI... [ Courtesy of Pauline Van Winsen.. pauline@Aus ]
-+# LHI... [ Courtesy of Pauline Van Winsen ]
- # [ Dec 1990 ]
- # Lord Howe Island is located off the New South Wales coast, and is half an
- # hour ahead of NSW time.
-@@ -1088,7 +1085,7 @@
- # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
- # # The Country of New Zealand (Australia's east island -) Gee they hate that!
- # # or is Australia the west island of N.Z.
--# # [ courtesy of Geoff Tribble.. Geofft@Aus.. Auckland N.Z. ]
-+# # [ courtesy of Geoff Tribble.. Auckland N.Z. ]
- # # [ Nov 1990 ]
- # ...
- # Rule NZ 1974 1988 - Oct lastSun 2:00 1:00 D
-@@ -1375,16 +1372,26 @@
- # mapmakers redrew the IDL following the boundary of Kiribati. Even that line
- # has a rather arbitrary nature. The straight-line boundaries between Pacific
- # island nations that are shown on many maps are based on an international
--# convention, but are not legally binding national borders.
--#
--# An Anglo-French Conference on Time-Keeping at Sea (June, 1917) agreed that
--# legal time on the high seas would be zone time, i.e., the standard time at
--# the nearest meridian that is a multiple of fifteen degrees. The date is
-+# convention, but are not legally binding national borders.... The date is
- # governed by the IDL; therefore, even on the high seas, there may be some
- # places as late as fourteen hours later than UTC. And, since the IDL is not
- # an international standard, there are some places on the high seas where the
- # correct date is ambiguous.
-
-+# From Wikipedia <http://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
-+# Before 1920, all ships kept local apparent time on the high seas by setting
-+# their clocks at night or at the morning sight so that, given the ship's
-+# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
-+# meridian (12 o'clock = local apparent noon). During 1917, at the
-+# Anglo-French Conference on Time-keeping at Sea, it was recommended that all
-+# ships, both military and civilian, should adopt hourly standard time zones
-+# on the high seas. Whenever a ship was within the territorial waters of any
-+# nation it would use that nation's standard time. The captain was permitted
-+# to change his ship's clocks at a time of his choice following his ship's
-+# entry into another zone time--he often chose midnight. These zones were
-+# adopted by all major fleets between 1920 and 1925 but not by many
-+# independent merchant ships until World War II.
-+
- # From Paul Eggert, using references suggested by Oscar van Vlijmen
- # (2005-03-20):
- #
-Index: timezone/backward
-===================================================================
---- timezone/backward.orig
-+++ timezone/backward
-@@ -1,4 +1,4 @@
--# @(#)backward 7.29
-+# @(#)backward 8.1
-
- # This file provides links between current names for time zones
- # and their old names. Many names changed in late 1993.
-@@ -42,7 +42,6 @@
- Link America/Noronha Brazil/DeNoronha
- Link America/Sao_Paulo Brazil/East
- Link America/Manaus Brazil/West
--Link America/Chicago CST6CDT
- Link America/Halifax Canada/Atlantic
- Link America/Winnipeg Canada/Central
- Link America/Regina Canada/East-Saskatchewan
-@@ -55,8 +54,6 @@
- Link America/Santiago Chile/Continental
- Link Pacific/Easter Chile/EasterIsland
- Link America/Havana Cuba
--Link America/Panama EST
--Link America/New_York EST5EDT
- Link Africa/Cairo Egypt
- Link Europe/Dublin Eire
- Link Europe/London Europe/Belfast
-@@ -67,7 +64,6 @@
- Link Etc/GMT GMT-0
- Link Etc/GMT GMT0
- Link Etc/GMT Greenwich
--Link Pacific/Honolulu HST
- Link Asia/Hong_Kong Hongkong
- Link Atlantic/Reykjavik Iceland
- Link Asia/Tehran Iran
-@@ -76,8 +72,6 @@
- Link Asia/Tokyo Japan
- Link Pacific/Kwajalein Kwajalein
- Link Africa/Tripoli Libya
--Link America/Phoenix MST
--Link America/Denver MST7MDT
- Link America/Tijuana Mexico/BajaNorte
- Link America/Mazatlan Mexico/BajaSur
- Link America/Mexico_City Mexico/General
-@@ -85,7 +79,6 @@
- Link Pacific/Chatham NZ-CHAT
- Link America/Denver Navajo
- Link Asia/Shanghai PRC
--Link America/Los_Angeles PST8PDT
- Link Pacific/Pago_Pago Pacific/Samoa
- Link Pacific/Truk Pacific/Yap
- Link Europe/Warsaw Poland
-Index: timezone/europe
-===================================================================
---- timezone/europe.orig
-+++ timezone/europe
-@@ -1,4 +1,5 @@
--# @(#)europe 7.95
-+# @(#)europe 8.1
-+# <pre>
-
- # This data is by no means authoritative; if you think you know better,
- # go ahead and edit the file (and please send any changes to
-Index: timezone/northamerica
-===================================================================
---- timezone/northamerica.orig
-+++ timezone/northamerica
-@@ -1,4 +1,6 @@
--# @(#)northamerica 7.79
-+# @(#)northamerica 8.1
-+# <pre>
-+
- # also includes Central America and the Caribbean
-
- # This data is by no means authoritative; if you think you know better,
-@@ -131,6 +133,26 @@
- Rule US 2007 max - Mar Sun>=8 2:00 1:00 D
- Rule US 2007 max - Nov Sun>=1 2:00 0 S
-
-+# From Arthur David Olson, 2005-12-19
-+# We generate the files specified below to guard against old files with
-+# obsolete information being left in the time zone binary directory.
-+# We limit the list to names that have appeared in previous versions of
-+# this time zone package.
-+# We do these as separate Zones rather than as Links to avoid problems if
-+# a particular place changes whether it observes DST.
-+# We put these specifications here in the northamerica file both to
-+# increase the chances that they'll actually get compiled and to
-+# avoid the need to duplicate the US rules in another file.
-+
-+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+Zone EST -5:00 - EST
-+Zone MST -7:00 - MST
-+Zone HST -10:00 - HST
-+Zone EST5EDT -5:00 US E%sT
-+Zone CST6CDT -6:00 US C%sT
-+Zone MST7MDT -7:00 US M%sT
-+Zone PST8PDT -8:00 US P%sT
-+
- # From Bob Devine (1988-01-28):
- # ...Alaska (and Hawaii) had the timezone names changed in 1967.
- # old new
-@@ -244,6 +266,16 @@
- # and didn't change their clocks for Daylight Saving ... so that their
- # reports will always have times which are 5 hours behind UTC.
-
-+# From Paul Eggert (2005-08-26):
-+# According to today's Huntsville Times
-+# <http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1>
-+# a few towns on Alabama's "eastern border with Georgia, such as Phenix City
-+# in Russell County, Lanett in Chambers County and some towns in Lee County,
-+# set their watches and clocks on Eastern time." It quotes H.H. "Bubba"
-+# Roberts, city administrator in Phenix City. as saying "We are in the Central
-+# time zone, but we do go by the Eastern time zone because so many people work
-+# in Columbus."
-+
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
-@@ -289,6 +321,14 @@
- Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
- -7:00 US M%sT 1992 Oct 25 02:00
- -6:00 US C%sT
-+# From Paul Eggert (2006-01-20):
-+# The following is not implemented yet.
-+# What is the most populous city in that area?
-+# From http://www.statoids.com/tus.html (2006-01-20):
-+# 2003-10-26 02:00: All of Morton County, ND, and the part of Sioux
-+# County, ND east of ND route 31 moved from MT to CT. (The area
-+# around Fort Yates in Sioux County and the area around Mandan in
-+# Morton County were already in CT.)
-
- # US mountain time, represented by Denver
- #
-@@ -487,9 +527,9 @@
- # For a map of Indiana's time zone regions, see:
- # <a href="http://www.mccsc.edu/time.html";>
- # What time is it in Indiana?
--# </a> (2005-05-03)
-+# </a> (2005-10-30)
- #
--# From Paul Eggert (2005-08-22):
-+# From Paul Eggert (2006-01-20):
- # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
- # with the following exceptions:
- #
-@@ -501,11 +541,14 @@
- # - Clark, Floyd, and Harrison counties have been like
- # America/Kentucky/Louisville.
- #
--# - Crawford, Starke, and Switzerland counties have their own time zone
-+# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
-+# have been like America/Indiana/Vincennes.
-+#
-+# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
- # histories as noted below.
- #
--# Shanks partitions Indiana into 345 regions, each with its own time history,
--# and writes ``Even newspaper reports present contradictory information.''
-+# Shanks partitioned Indiana into 345 regions, each with its own time history,
-+# and wrote ``Even newspaper reports present contradictory information.''
- # Fortunately, most of the complexity occurred before our cutoff date of 1970.
- #
- # Other than Indianapolis, the Indiana place names are so nondescript
-@@ -513,11 +556,19 @@
- # So we reluctantly put them all in a subdirectory `America/Indiana'.
-
- # From Paul Eggert (2005-08-16):
--# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006,
--# and that many counties may switch either to Central or to Eastern time.
--# The county-by-county decisions have not been made yet, so for now assume
--# that no counties will switch: this assumption is most likely wrong,
--# but it's the best we can do for now.
-+# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
-+
-+# From Deborah Goldsmith (2006-01-18):
-+# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf
-+# From Paul Eggert (2006-01-20):
-+# It says "DOT is relocating the time zone boundary in Indiana to move Starke,
-+# Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
-+# Eastern Time Zone to the Central Time Zone.... The effective date of
-+# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the
-+# changeover date from standard time to Daylight Saving Time."
-+# Strictly speaking, this means the affected counties will change their
-+# clocks twice that night, but this obviously is in error. The intent
-+# is that 01:59:59 EST be followed by 02:00:00 CDT.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
-@@ -536,8 +587,8 @@
- -5:00 - EST 2006
- -5:00 US E%sT
- #
--# Part of Crawford County, Indiana, last observed DST in 1975,
--# and left its clocks alone in 1974.
-+# Eastern Crawford County, Indiana, left its clocks alone in 1974,
-+# as well as from 1976 through 2005.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
-@@ -554,7 +605,45 @@
- -5:00 - EST 2006
- -5:00 US E%sT
- #
--# Starke County, Indiana
-+# Daviess, Dubois, Knox, Martin, Perry, and Pulaski Counties, Indiana,
-+# switched from eastern to central time in April 2006.
-+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
-+Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
-+Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-+Rule Vincennes 1953 1959 - Sep lastSun 2:00 0 S
-+Rule Vincennes 1955 only - May 1 0:00 1:00 D
-+Rule Vincennes 1956 1963 - Apr lastSun 2:00 1:00 D
-+Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
-+Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
-+Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
-+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
-+ -6:00 US C%sT 1946
-+ -6:00 Vincennes C%sT 1964 Apr 26 2:00
-+ -5:00 - EST 1969
-+ -5:00 US E%sT 1971
-+ -5:00 - EST 2006 Apr 2 2:00
-+ -6:00 US C%sT
-+#
-+# Pike County, Indiana moved from central to eastern time in 1977,
-+# then switched back in 2006.
-+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+Rule Pike 1955 only - May 1 0:00 1:00 D
-+Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
-+Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-+Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
-+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
-+ -6:00 US C%sT 1955
-+ -6:00 Pike C%sT 1965 Apr 25 2:00
-+ -5:00 - EST 1966 Oct 30 2:00
-+ -6:00 US C%sT 1977 Oct 30 2:00
-+ -5:00 - EST 2006 Apr 2 2:00
-+ -6:00 US C%sT
-+#
-+# Starke County, Indiana moved from central to eastern time in 1991,
-+# then switched back in 2006.
- # From Arthur David Olson (1991-10-28):
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
-@@ -571,10 +660,10 @@
- -6:00 Starke C%sT 1962 Apr 29 2:00
- -5:00 - EST 1963 Oct 27 2:00
- -6:00 US C%sT 1991 Oct 27 2:00
-- -5:00 - EST 2006
-- -5:00 US E%sT
-+ -5:00 - EST 2006 Apr 2 2:00
-+ -6:00 US C%sT
- #
--# Switzerland County, Indiana, last observed DST in 1972.
-+# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
- -6:00 US C%sT 1954 Apr 25 2:00
-@@ -604,7 +693,7 @@
- -6:00 1:00 CDT 1974 Oct 27 2:00
- -5:00 US E%sT
- #
--# Wayne, Clinton, and Russell Counties, Kentucky
-+# Wayne County, Kentucky
- #
- # From
- # <a href="http://www.lake-cumberland.com/life/archive/news990129time.shtml";>
-@@ -701,7 +790,8 @@
- -5:00 - EST 1975 Apr 27 2:00
- -5:00 US E%sT
- #
--# The Michigan border with Wisconsin switched from EST to CST/CDT in 1973.
-+# Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
-+# switched from EST to CST/CDT in 1973.
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
-@@ -790,18 +880,37 @@
-
- # Unless otherwise specified, the data for Canada are all from Shanks.
-
--# From Paul Eggert (2000-10-02):
-+# From Paul Eggert (2005-12-21):
- # H. David Matthews and Mary Vincent's map
--# <a href="http://www.canadiangeographic.ca/SO98/geomap.htm";>
-+# <a href="http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp";>
- # "It's about TIME", _Canadian Geographic_ (September-October 1998)
- # </a> contains detailed boundaries for regions observing nonstandard
- # time and daylight saving time arrangements in Canada circa 1998.
- #
--# INMS, the Institute for National Measurement Standards in Ottawa, has
--# <a href="http://www.nrc.ca/inms/time/tze.html";>
-+# INMS, the Institute for National Measurement Standards in Ottawa, has <a
-+# href="http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php";>
- # information about standard and daylight saving time zones in Canada.
- # </a> (updated periodically).
- # Its unofficial information is often taken from Matthews and Vincent.
-+#
-+# CBC News reported that Ontario and Manitoba have announced plans to
-+# follow the US change, and that Nova Scotia is considering it; see
-+# <http://www.cbc.ca/news/background/daylightsavingtime/> (2005-10-21).
-+# CBC news also reported that Prince Edward Island is the first
-+# province in Atlantic Canada to follow the US change, and that Quebec
-+# had agreed; see <http://www.cbc.ca/pei/story/pe_daylight_20051207.html>
-+# (2005-12-07).
-+#
-+# To reflect all this, the Canada and Winn rules have been adjusted to
-+# agree with the 2007 US change. This means we assume most of Canada
-+# will fall into line. However, Alberta, British Columbia,
-+# Newfoundland, Northwest Territories, and Yukon already have separate
-+# rules in our database, so for now we'll leave them alone, which
-+# means that we currently assume these regions will not change their
-+# rules and will disagree with the US starting in 2007. This
-+# assumption is probably incorrect, with the possible exception of
-+# Newfoundland. We plan to adjust the Edm, Vanc, StJohns, and NT_YK
-+# rules as the corresponding provinces make their announcements.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
-@@ -810,8 +919,10 @@
- Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace
- Rule Canada 1945 only - Sep 30 2:00 0 S
- Rule Canada 1974 1986 - Apr lastSun 2:00 1:00 D
--Rule Canada 1974 max - Oct lastSun 2:00 0 S
--Rule Canada 1987 max - Apr Sun>=1 2:00 1:00 D
-+Rule Canada 1974 2006 - Oct lastSun 2:00 0 S
-+Rule Canada 1987 2006 - Apr Sun>=1 2:00 1:00 D
-+Rule Canada 2007 max - Mar Sun>=8 2:00 1:00 D
-+Rule Canada 2007 max - Nov Sun>=1 2:00 0 S
-
-
- # Newfoundland (and far southeast Labrador)
-@@ -876,7 +987,7 @@
- -4:00 StJohns A%sT
-
-
--# west Labrador, New Brunswick, Nova Scotia, Prince Edward I
-+# west Labrador, Nova Scotia, Prince Edward I
-
- # From Paul Eggert (1996-06-12):
- # Shanks writes that since 1970 most of this region has been like Halifax.
-@@ -885,53 +996,48 @@
- # Shanks also writes that Liverpool, NS was the only town in Canada to observe
- # DST in 1971 but not 1970; for now we'll assume this is a typo.
-
--# From Paul Eggert (2000-10-02):
--# INMS (2000-09-12) says that, since 1988 at least, New Brunswick switches
--# at 00:01 local time. FIXME: verify and create a new Zone for this.
--
--
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Halifax 1916 only - Apr 1 0:00 1:00 D
--Rule Halifax 1916 only - Oct 1 0:00 0 S
--Rule Halifax 1920 only - May 9 0:00 1:00 D
--Rule Halifax 1920 only - Aug 29 0:00 0 S
--Rule Halifax 1921 only - May 6 0:00 1:00 D
--Rule Halifax 1921 1922 - Sep 5 0:00 0 S
--Rule Halifax 1922 only - Apr 30 0:00 1:00 D
--Rule Halifax 1923 1925 - May Sun>=1 0:00 1:00 D
--Rule Halifax 1923 only - Sep 4 0:00 0 S
--Rule Halifax 1924 only - Sep 15 0:00 0 S
--Rule Halifax 1925 only - Sep 28 0:00 0 S
--Rule Halifax 1926 only - May 16 0:00 1:00 D
--Rule Halifax 1926 only - Sep 13 0:00 0 S
--Rule Halifax 1927 only - May 1 0:00 1:00 D
--Rule Halifax 1927 only - Sep 26 0:00 0 S
--Rule Halifax 1928 1931 - May Sun>=8 0:00 1:00 D
--Rule Halifax 1928 only - Sep 9 0:00 0 S
--Rule Halifax 1929 only - Sep 3 0:00 0 S
--Rule Halifax 1930 only - Sep 15 0:00 0 S
--Rule Halifax 1931 1932 - Sep Mon>=24 0:00 0 S
--Rule Halifax 1932 only - May 1 0:00 1:00 D
--Rule Halifax 1933 only - Apr 30 0:00 1:00 D
--Rule Halifax 1933 only - Oct 2 0:00 0 S
--Rule Halifax 1934 only - May 20 0:00 1:00 D
--Rule Halifax 1934 only - Sep 16 0:00 0 S
--Rule Halifax 1935 only - Jun 2 0:00 1:00 D
--Rule Halifax 1935 only - Sep 30 0:00 0 S
--Rule Halifax 1936 only - Jun 1 0:00 1:00 D
--Rule Halifax 1936 only - Sep 14 0:00 0 S
--Rule Halifax 1937 1938 - May Sun>=1 0:00 1:00 D
--Rule Halifax 1937 1941 - Sep Mon>=24 0:00 0 S
--Rule Halifax 1939 only - May 28 0:00 1:00 D
--Rule Halifax 1940 1941 - May Sun>=1 0:00 1:00 D
--Rule Halifax 1946 1949 - Sep lastSun 2:00 0 S
--Rule Halifax 1946 1949 - Apr lastSun 2:00 1:00 D
--Rule Halifax 1951 1954 - Sep lastSun 2:00 0 S
--Rule Halifax 1951 1954 - Apr lastSun 2:00 1:00 D
--Rule Halifax 1956 1959 - Sep lastSun 2:00 0 S
--Rule Halifax 1956 1959 - Apr lastSun 2:00 1:00 D
--Rule Halifax 1962 1973 - Apr lastSun 2:00 1:00 D
--Rule Halifax 1962 1973 - Oct lastSun 2:00 0 S
-+Rule Halifax 1916 only - Apr 1 0:00 1:00 D
-+Rule Halifax 1916 only - Oct 1 0:00 0 S
-+Rule Halifax 1920 only - May 9 0:00 1:00 D
-+Rule Halifax 1920 only - Aug 29 0:00 0 S
-+Rule Halifax 1921 only - May 6 0:00 1:00 D
-+Rule Halifax 1921 1922 - Sep 5 0:00 0 S
-+Rule Halifax 1922 only - Apr 30 0:00 1:00 D
-+Rule Halifax 1923 1925 - May Sun>=1 0:00 1:00 D
-+Rule Halifax 1923 only - Sep 4 0:00 0 S
-+Rule Halifax 1924 only - Sep 15 0:00 0 S
-+Rule Halifax 1925 only - Sep 28 0:00 0 S
-+Rule Halifax 1926 only - May 16 0:00 1:00 D
-+Rule Halifax 1926 only - Sep 13 0:00 0 S
-+Rule Halifax 1927 only - May 1 0:00 1:00 D
-+Rule Halifax 1927 only - Sep 26 0:00 0 S
-+Rule Halifax 1928 1931 - May Sun>=8 0:00 1:00 D
-+Rule Halifax 1928 only - Sep 9 0:00 0 S
-+Rule Halifax 1929 only - Sep 3 0:00 0 S
-+Rule Halifax 1930 only - Sep 15 0:00 0 S
-+Rule Halifax 1931 1932 - Sep Mon>=24 0:00 0 S
-+Rule Halifax 1932 only - May 1 0:00 1:00 D
-+Rule Halifax 1933 only - Apr 30 0:00 1:00 D
-+Rule Halifax 1933 only - Oct 2 0:00 0 S
-+Rule Halifax 1934 only - May 20 0:00 1:00 D
-+Rule Halifax 1934 only - Sep 16 0:00 0 S
-+Rule Halifax 1935 only - Jun 2 0:00 1:00 D
-+Rule Halifax 1935 only - Sep 30 0:00 0 S
-+Rule Halifax 1936 only - Jun 1 0:00 1:00 D
-+Rule Halifax 1936 only - Sep 14 0:00 0 S
-+Rule Halifax 1937 1938 - May Sun>=1 0:00 1:00 D
-+Rule Halifax 1937 1941 - Sep Mon>=24 0:00 0 S
-+Rule Halifax 1939 only - May 28 0:00 1:00 D
-+Rule Halifax 1940 1941 - May Sun>=1 0:00 1:00 D
-+Rule Halifax 1946 1949 - Apr lastSun 2:00 1:00 D
-+Rule Halifax 1946 1949 - Sep lastSun 2:00 0 S
-+Rule Halifax 1951 1954 - Apr lastSun 2:00 1:00 D
-+Rule Halifax 1951 1954 - Sep lastSun 2:00 0 S
-+Rule Halifax 1956 1959 - Apr lastSun 2:00 1:00 D
-+Rule Halifax 1956 1959 - Sep lastSun 2:00 0 S
-+Rule Halifax 1962 1973 - Apr lastSun 2:00 1:00 D
-+Rule Halifax 1962 1973 - Oct lastSun 2:00 0 S
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Halifax -4:14:24 - LMT 1902 Jun 15
- -4:00 Halifax A%sT 1918
-@@ -947,6 +1053,43 @@
- -4:00 Halifax A%sT 1974
- -4:00 Canada A%sT
-
-+# New Brunswick
-+
-+# From Paul Eggert (2006-01-20):
-+# New Brunswick's Time Definition Act
-+# <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> says they change at 00:01, and
-+# <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it
-+# clear that this has been the case since at least 1993.
-+# For now, assume it started in 1993. The Office of the Premier announced
-+# <http://www.gnb.ca/cnb/news/pre/2005e1737pr.htm> (2005-12-23)
-+# that they will bring forward proposed amendments to harmonize with the US;
-+# for now assume that this will happen, but they'll still switch at 00:01.
-+
-+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
-+Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
-+Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-+Rule Moncton 1936 1938 - Sep Sun>=1 1:00 0 S
-+Rule Moncton 1939 only - May 27 1:00 1:00 D
-+Rule Moncton 1939 1941 - Sep Sat>=21 1:00 0 S
-+Rule Moncton 1940 only - May 19 1:00 1:00 D
-+Rule Moncton 1941 only - May 4 1:00 1:00 D
-+Rule Moncton 1946 1972 - Apr lastSun 2:00 1:00 D
-+Rule Moncton 1946 1956 - Sep lastSun 2:00 0 S
-+Rule Moncton 1956 1972 - Oct lastSun 2:00 0 S
-+Rule Moncton 1993 2006 - Apr Sun>=1 0:01 1:00 D
-+Rule Moncton 1993 2006 - Oct lastSun 0:01 0 S
-+Rule Moncton 2007 max - Mar Sun>=8 0:01 1:00 D
-+Rule Moncton 2007 max - Nov Sun>=1 0:01 0 S
-+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-+Zone America/Moncton -4:19:08 - LMT 1883 Dec 9
-+ -5:00 - EST 1902 Jun 15
-+ -4:00 Canada A%sT 1933
-+ -4:00 Moncton A%sT 1942
-+ -4:00 Canada A%sT 1946
-+ -4:00 Moncton A%sT 1973
-+ -4:00 Canada A%sT 1993
-+ -4:00 Moncton A%sT
-
- # Ontario, Quebec
-
-@@ -1137,11 +1280,13 @@
- Rule Winn 1963 only - Sep 22 2:00 0 S
- Rule Winn 1966 1986 - Apr lastSun 2:00 1:00 D
- Rule Winn 1966 1986 - Oct lastSun 2:00 0 S
--Rule Winn 1987 max - Apr Sun>=1 2:00 1:00 D
-+Rule Winn 1987 2006 - Apr Sun>=1 2:00s 1:00 D
- # From Paul Eggert (2000-10-02):
- # INMS (2000-09-12) says that, since 1988 at least, Manitoba switches from
- # DST at 03:00 local time. For now, assume it started in 1987.
--Rule Winn 1987 max - Oct lastSun 2:00s 0 S
-+Rule Winn 1987 2006 - Oct lastSun 2:00s 0 S
-+Rule Winn 2007 max - Mar Sun>=8 2:00s 1:00 D
-+Rule Winn 2007 max - Nov Sun>=1 2:00s 0 S
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Winnipeg -6:28:36 - LMT 1887 Jul 16
- -6:00 Winn C%sT
-@@ -1805,6 +1950,11 @@
- # to normal hours (after daylight saving time)".
- # For now, let's assume that it's a one-year temporary measure.
-
-+# From Carlos A. Carnero Delgado (2005-11-12):
-+# This year (just like in 2004-2005) there's no change in time zone
-+# adjustment in Cuba. We will stay in daylight saving time:
-+# http://www.granma.cu/espanol/2005/noviembre/mier9/horario.html
-+
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
-@@ -1835,7 +1985,7 @@
- Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
- Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
- Rule Cuba 2000 max - Apr Sun>=1 0:00s 1:00 D
--Rule Cuba 2005 max - Oct lastSun 0:00s 0 S
-+Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
-
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Havana -5:29:28 - LMT 1890
-@@ -2021,13 +2171,18 @@
- # changes in 2000. Perhaps a note could be added to the northamerica file, to
- # the effect that we have indirect evidence that DST was observed in 2000.
- #
-+# From Jesper Norgaard Welen (2005-11-02):
-+# Nicaragua left DST the 2005-10-02 at 00:00 (local time).
-+# http://www.presidencia.gob.ni/presidencia/files_index/secretaria/comunicados/2005/septiembre/26septiembre-cambio-hora.htm
-+# (2005-09-26)
-+#
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
--Rule Nic 1992 only - Jan 1 4:00 1:00 D
-+Rule Nic 1992 only - Jan 1 4:00 1:00 D
- Rule Nic 1992 only - Sep 24 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
--Rule Nic 2005 only - Sep 18 0:00 0 S
-+Rule Nic 2005 only - Oct 2 0:00 0 S
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Managua -5:45:08 - LMT 1890
- -5:45:12 - MMT 1934 Jun 23 # Managua Mean Time?
-Index: timezone/private.h
-===================================================================
---- timezone/private.h.orig
-+++ timezone/private.h
-@@ -4,7 +4,7 @@
-
- /*
- ** This file is in the public domain, so clarified as of
--** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-+** 1996-06-05 by Arthur David Olson.
- */
-
- /*
-@@ -218,7 +218,7 @@
- void * irealloc P((void * pointer, int size));
- void icfree P((char * pointer));
- void ifree P((char * pointer));
--char * scheck P((const char *string, char *format));
-+const char *scheck P((const char *string, const char *format));
-
- /*
- ** Finally, some convenience items.
-Index: timezone/scheck.c
-===================================================================
---- timezone/scheck.c.orig
-+++ timezone/scheck.c
-@@ -1,6 +1,6 @@
- #ifndef lint
- #ifndef NOID
--static char elsieid[] = "@(#)scheck.c 8.16";
-+static char elsieid[] = "@(#)scheck.c 8.17";
- #endif /* !defined lint */
- #endif /* !defined NOID */
-
-@@ -8,20 +8,19 @@
-
- #include "private.h"
-
--char *
-+const char *
- scheck(string, format)
- const char * const string;
--char * const format;
-+const char * const format;
- {
- register char * fbuf;
- register const char * fp;
- register char * tp;
- register int c;
-- register char * result;
-+ register const char * result;
- char dummy;
-- static char nada;
-
-- result = &nada;
-+ result = "";
- if (string == NULL || format == NULL)
- return result;
- fbuf = imalloc((int) (2 * strlen(format) + 4));
-Index: timezone/southamerica
-===================================================================
---- timezone/southamerica.orig
-+++ timezone/southamerica
-@@ -1,4 +1,5 @@
--# @(#)southamerica 7.61
-+# @(#)southamerica 8.1
-+# <pre>
-
- # This data is by no means authoritative; if you think you know better,
- # go ahead and edit the file (and please send any changes to
-@@ -525,12 +526,6 @@
- # This year, the ending date of DS was postponed to March 1
- # to help dealing with the shortages of electric power.
- #
--# From Paul Eggert (1998-02-25):
--# <a href="http://churchnet.ucsm.ac.uk/news/files2/news165.htm";>
--# Brazil Prepares for Papal Visit
--# </a>,
--# Church Net UK (1997-10-02).
--#
- # Decree 2,317 (1997-09-04), adopted by same states.
- Rule Brazil 1997 only - Oct 6 0:00 1:00 S
- # Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG";>2,495</a>
-@@ -565,11 +560,12 @@
- # Decree 5,223 (2004-10-01) reestablishes DST in MT.
- # <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm";></a>
- Rule Brazil 2004 only - Nov 2 0:00 1:00 S
-+# Decree <a href="http://pcdsh01.on.br/DecHV5539.gif";>5,539</a> (2005-09-19),
-+# adopted by the same states as before.
-+Rule Brazil 2005 max - Oct Sun>=15 0:00 1:00 S
- # The latest ruleset listed above says that the following states observe DST:
- # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
--#
--Rule Brazil 2005 max - Oct Sun>=15 0:00 1:00 S
--# For dates after mid-2005, the above rules with TO="max" are guesses
-+# For dates after mid-2006, the above rules with TO="max" are guesses
- # and are quite possibly wrong, but are more likely than no DST at all.
-
-
-@@ -1055,6 +1051,12 @@
- # save energy ... it was postponed two weeks....
- # http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
- Rule Uruguay 2005 only - Mar 27 2:00 0 -
-+# From Eduardo Cota (2005-09-27):
-+# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
-+# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
-+# 02:00 local time, official time in Uruguay will be at GMT -2.
-+Rule Uruguay 2005 only - Oct 9 2:00 1:00 S
-+Rule Uruguay 2006 only - Mar 12 2:00 0 -
- # Zone NAME GMTOFF RULES FORMAT [UNTIL]
- Zone America/Montevideo -3:44:44 - LMT 1898 Jun 28
- -3:44:44 - MMT 1920 May 1 # Montevideo MT
-Index: timezone/systemv
-===================================================================
---- timezone/systemv.orig
-+++ timezone/systemv
-@@ -1,24 +1,24 @@
--# @(#)systemv 7.3
-+# @(#)systemv 8.1
-
- # Old rules, should the need arise.
- # No attempt is made to handle Newfoundland, since it cannot be expressed
- # using the System V "TZ" scheme (half-hour offset), or anything outside
- # North America (no support for non-standard DST start/end dates), nor
--# the change in the DST rules in the US in 1987 (which occurred before
-+# the changes in the DST rules in the US after 1976 (which occurred after
- # the old rules were written).
- #
--# If you need the old rules, uncomment ## lines and comment-out Link lines.
-+# If you need the old rules, uncomment ## lines.
- # Compile this *without* leap second correction for true conformance.
-
- # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--## Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--## Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--## Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--## Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--## Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--## Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--## Rule SystemV 1976 max - Oct lastSun 2:00 0 S
-+Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
-+Rule SystemV min 1973 - Oct lastSun 2:00 0 S
-+Rule SystemV 1974 only - Jan 6 2:00 1:00 D
-+Rule SystemV 1974 only - Nov lastSun 2:00 0 S
-+Rule SystemV 1975 only - Feb 23 2:00 1:00 D
-+Rule SystemV 1975 only - Oct lastSun 2:00 0 S
-+Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
-+Rule SystemV 1976 max - Oct lastSun 2:00 0 S
-
- # Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
- ## Zone SystemV/AST4ADT -4:00 SystemV A%sT
-@@ -34,17 +34,3 @@
- ## Zone SystemV/PST8 -8:00 - PST
- ## Zone SystemV/YST9 -9:00 - YST
- ## Zone SystemV/HST10 -10:00 - HST
--# For now...
--Link America/Halifax SystemV/AST4ADT
--Link America/New_York SystemV/EST5EDT
--Link America/Chicago SystemV/CST6CDT
--Link America/Denver SystemV/MST7MDT
--Link America/Los_Angeles SystemV/PST8PDT
--Link America/Anchorage SystemV/YST9YDT
--Link America/Puerto_Rico SystemV/AST4
--Link America/Indianapolis SystemV/EST5
--Link America/Regina SystemV/CST6
--Link America/Phoenix SystemV/MST7
--Link Pacific/Pitcairn SystemV/PST8
--Link Pacific/Gambier SystemV/YST9
--Link Pacific/Honolulu SystemV/HST10
-Index: timezone/test-tz.c
-===================================================================
---- timezone/test-tz.c.orig
-+++ timezone/test-tz.c
-@@ -7,7 +7,7 @@
- const char * env;
- time_t expected;
- } tests[] = {
-- {"MST", 832910115},
-+ {"MST", 832935315},
- {"", 832910115},
- {":UTC", 832910115},
- {"UTC", 832910115},
-Index: timezone/tzfile.h
-===================================================================
---- timezone/tzfile.h.orig
-+++ timezone/tzfile.h
-@@ -4,7 +4,7 @@
-
- /*
- ** This file is in the public domain, so clarified as of
--** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-+** 1996-06-05 by Arthur David Olson.
- */
-
- /*
-@@ -21,7 +21,7 @@
-
- #ifndef lint
- #ifndef NOID
--static char tzfilehid[] = "@(#)tzfile.h 7.17";
-+static char tzfilehid[] = "@(#)tzfile.h 7.18";
- #endif /* !defined NOID */
- #endif /* !defined lint */
-
-@@ -105,7 +105,7 @@
- #ifdef NOSOLAR
- /*
- ** Must be at least 14 for Europe/Riga as of Jan 12 1995,
--** as noted by Earl Chew <earl@hpato.aus.hp.com>.
-+** as noted by Earl Chew.
- */
- #define TZ_MAX_TYPES 20 /* Maximum number of local time types */
- #endif /* !defined NOSOLAR */
-Index: timezone/zdump.c
-===================================================================
---- timezone/zdump.c.orig
-+++ timezone/zdump.c
-@@ -1,4 +1,4 @@
--static char elsieid[] = "@(#)zdump.c 7.66";
-+static char elsieid[] = "@(#)zdump.c 7.74";
-
- /*
- ** This code has been made independent of the rest of the time
-@@ -12,7 +12,10 @@
- #include "time.h" /* for struct tm */
- #include "stdlib.h" /* for exit, malloc, atoi */
- #include "float.h" /* for FLT_MAX and DBL_MAX */
--#include <ctype.h> /* for isascii, isalpha, isdigit */
-+#include "ctype.h" /* for isalpha et al. */
-+#ifndef isascii
-+#define isascii(x) 1
-+#endif
-
- #ifndef ZDUMP_LO_YEAR
- #define ZDUMP_LO_YEAR (-500)
-@@ -148,7 +151,7 @@
- static int warned;
-
- static char * abbr P((struct tm * tmp));
--static void abbrok P((const char * abbr, const char * zone));
-+static void abbrok P((const char * abbrp, const char * zone));
- static long delta P((struct tm * newp, struct tm * oldp));
- static void dumptime P((const struct tm * tmp));
- static time_t hunt P((char * name, time_t lot, time_t hit));
-@@ -195,8 +198,8 @@
- #endif /* !defined TYPECHECK */
-
- static void
--abbrok(abbr, zone)
--const char * const abbr;
-+abbrok(abbrp, zone)
-+const char * const abbrp;
- const char * const zone;
- {
- register const char * cp;
-@@ -204,30 +207,31 @@
-
- if (warned)
- return;
-- cp = abbr;
-+ cp = abbrp;
- wp = NULL;
-- while (isascii(*cp) && isalpha(*cp))
-+ while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
- ++cp;
-- if (cp - abbr == 0)
-+ if (cp - abbrp == 0)
- wp = _("lacks alphabetic at start");
-- if (cp - abbr < 3)
-+ else if (cp - abbrp < 3)
- wp = _("has fewer than 3 alphabetics");
-- if (cp - abbr > 6)
-+ else if (cp - abbrp > 6)
- wp = _("has more than 6 alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
-- if (isascii(*cp) && isdigit(*cp))
-- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
-- ++cp;
-+ if (isascii((unsigned char) *cp) &&
-+ isdigit((unsigned char) *cp))
-+ if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
-+ ++cp;
-+ if (*cp != '\0')
-+ wp = _("differs from POSIX standard");
- }
-- if (*cp != '\0')
-- wp = _("differs from POSIX standard");
- if (wp == NULL)
- return;
- (void) fflush(stdout);
- (void) fprintf(stderr,
-- "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n",
-- progname, zone, abbr, wp);
-+ _("%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"),
-+ progname, zone, abbrp, wp);
- warned = TRUE;
- }
-
-@@ -266,7 +270,7 @@
- for (i = 1; i < argc; ++i)
- if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", elsieid);
-- (void) exit(EXIT_SUCCESS);
-+ exit(EXIT_SUCCESS);
- }
- vflag = 0;
- cutarg = NULL;
-@@ -279,7 +283,7 @@
- (void) fprintf(stderr,
- _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),
- progname, progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if (vflag) {
- if (cutarg != NULL) {
-@@ -296,7 +300,7 @@
- } else {
- (void) fprintf(stderr, _("%s: wild -c argument %s\n"),
- progname, cutarg);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
- setabsolutes();
-@@ -319,7 +323,7 @@
- if (fakeenv == NULL ||
- (fakeenv[0] = (char *) malloc(longest + 4)) == NULL) {
- (void) perror(progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- to = 0;
- (void) strcpy(fakeenv[to++], "TZ=");
-@@ -386,7 +390,7 @@
- if (fflush(stdout) || ferror(stdout)) {
- (void) fprintf(stderr, "%s: ", progname);
- (void) perror(_("Error writing standard output"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- exit(EXIT_SUCCESS);
- /* If exit fails to exit... */
-@@ -410,7 +414,7 @@
- (void) fprintf(stderr,
- _("%s: use of -v on system with floating time_t other than float or double\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- } else if (0 > (time_t) -1) {
- /*
-@@ -510,7 +514,7 @@
- }
-
- /*
--** Thanks to Paul Eggert (eggert@twinsun.com) for logic used in delta.
-+** Thanks to Paul Eggert for logic used in delta.
- */
-
- static long
-Index: timezone/zic.c
-===================================================================
---- timezone/zic.c.orig
-+++ timezone/zic.c
-@@ -1,4 +1,4 @@
--static char elsieid[] = "@(#)zic.c 7.124";
-+static char elsieid[] = "@(#)zic.c 7.128";
-
- /*
- ** Regardless of the type of time_t, we do our work using this type.
-@@ -370,7 +370,7 @@
-
- (void) fprintf(stderr, _("%s: Memory exhausted: %s\n"),
- progname, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- return ptr;
- }
-@@ -456,7 +456,7 @@
- [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
- \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"),
- progname, progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
-
- static const char * psxrules;
-@@ -489,7 +489,7 @@
- for (i = 1; i < argc; ++i)
- if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", elsieid);
-- (void) exit(EXIT_SUCCESS);
-+ exit(EXIT_SUCCESS);
- }
- while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF && c != -1)
- switch (c) {
-@@ -502,7 +502,7 @@
- (void) fprintf(stderr,
- _("%s: More than one -d option specified\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- case 'l':
-@@ -512,7 +512,7 @@
- (void) fprintf(stderr,
- _("%s: More than one -l option specified\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- case 'p':
-@@ -522,7 +522,7 @@
- (void) fprintf(stderr,
- _("%s: More than one -p option specified\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- case 'y':
-@@ -532,7 +532,7 @@
- (void) fprintf(stderr,
- _("%s: More than one -y option specified\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- case 'L':
-@@ -542,7 +542,7 @@
- (void) fprintf(stderr,
- _("%s: More than one -L option specified\n"),
- progname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- case 'v':
-@@ -569,7 +569,7 @@
- for (i = optind; i < argc; ++i)
- infile(argv[i]);
- if (errors)
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- associate();
- for (i = 0; i < nzones; i = j) {
- /*
-@@ -634,7 +634,7 @@
- int result;
-
- if (mkdirs(toname) != 0)
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
-
- result = link(fromname, toname);
- #if HAVE_SYMLINK
-@@ -648,14 +648,14 @@
- symlinkcontents =
- ecatalloc(symlinkcontents,
- "../");
-- symlinkcontents =
-- ecatalloc(symlinkcontents,
-- fromfile);
-- result = symlink(symlinkcontents,
-- toname);
-- if (result == 0)
-+ symlinkcontents =
-+ ecatalloc(symlinkcontents,
-+ fromname);
-+ result = symlink(symlinkcontents,
-+ toname);
-+ if (result == 0)
- warning(_("hard link failed, symbolic link used"));
-- ifree(symlinkcontents);
-+ ifree(symlinkcontents);
- }
- #endif /* HAVE_SYMLINK */
- if (result != 0) {
-@@ -664,7 +664,7 @@
- (void) fprintf(stderr,
- _("%s: Can't link from %s to %s: %s\n"),
- progname, fromname, toname, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
- ifree(fromname);
-@@ -825,7 +825,7 @@
- }
- }
- if (errors)
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
-
- static void
-@@ -849,7 +849,7 @@
-
- (void) fprintf(stderr, _("%s: Can't open %s: %s\n"),
- progname, name, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- wantcont = FALSE;
- for (num = 1; ; ++num) {
-@@ -859,7 +859,7 @@
- cp = strchr(buf, '\n');
- if (cp == NULL) {
- error(_("line too long"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- *cp = '\0';
- fields = getfields(buf);
-@@ -903,7 +903,7 @@
- (void) fprintf(stderr,
- _("%s: panic: Invalid l_value %d\n"),
- progname, lp->l_value);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
- ifree((char *) fields);
-@@ -911,14 +911,14 @@
- if (ferror(fp)) {
- (void) fprintf(stderr, _("%s: Error reading %s\n"),
- progname, filename);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if (fp != stdin && fclose(fp)) {
- const char *e = strerror(errno);
-
- (void) fprintf(stderr, _("%s: Error closing %s: %s\n"),
- progname, filename, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if (wantcont)
- error(_("expected continuation line not found"));
-@@ -1324,7 +1324,7 @@
- (void) fprintf(stderr,
- _("%s: panic: Invalid l_value %d\n"),
- progname, lp->l_value);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- } else if (sscanf(cp, scheck(cp, "%d"), &rp->r_loyear) != 1) {
- error(_("invalid starting year"));
- return;
-@@ -1349,7 +1349,7 @@
- (void) fprintf(stderr,
- _("%s: panic: Invalid l_value %d\n"),
- progname, lp->l_value);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- } else if (sscanf(cp, scheck(cp, "%d"), &rp->r_hiyear) != 1) {
- error(_("invalid ending year"));
- return;
-@@ -1520,17 +1520,17 @@
-
- (void) fprintf(stderr, _("%s: Can't remove %s: %s\n"),
- progname, fullname, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if ((fp = fopen(fullname, "wb")) == NULL) {
- if (mkdirs(fullname) != 0)
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- if ((fp = fopen(fullname, "wb")) == NULL) {
- const char *e = strerror(errno);
-
- (void) fprintf(stderr, _("%s: Can't create %s: %s\n"),
- progname, fullname, e);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
- convert(eitol(typecnt), tzh.tzh_ttisgmtcnt);
-@@ -1597,7 +1597,7 @@
- if (ferror(fp) || fclose(fp)) {
- (void) fprintf(stderr, _("%s: Error writing %s\n"),
- progname, fullname);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
-
-@@ -1648,7 +1648,7 @@
- typecnt = 0;
- charcnt = 0;
- /*
-- ** Thanks to Earl Chew (earl@dnd.icp.nec.com.au)
-+ ** Thanks to Earl Chew
- ** for noting the need to unconditionally initialize startttisstd.
- */
- startttisstd = FALSE;
-@@ -1830,7 +1830,7 @@
- }
- if (timecnt >= TZ_MAX_TIMES) {
- error(_("too many transitions?!"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- attypes[timecnt].at = starttime;
- attypes[timecnt].type = type;
-@@ -1849,15 +1849,15 @@
-
- if (isdst != TRUE && isdst != FALSE) {
- error(_("internal error - addtype called with bad isdst"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if (ttisstd != TRUE && ttisstd != FALSE) {
- error(_("internal error - addtype called with bad ttisstd"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- if (ttisgmt != TRUE && ttisgmt != FALSE) {
- error(_("internal error - addtype called with bad ttisgmt"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- /*
- ** See if there's already an entry for this zone type.
-@@ -1876,7 +1876,7 @@
- */
- if (typecnt >= TZ_MAX_TYPES) {
- error(_("too many local time types"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- gmtoffs[i] = gmtoff;
- isdsts[i] = isdst;
-@@ -1904,13 +1904,13 @@
-
- if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) {
- error(_("too many leap seconds"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- for (i = 0; i < leapcnt; ++i)
- if (t <= trans[i]) {
- if (t == trans[i]) {
- error(_("repeated leap second moment"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- break;
- }
-@@ -1965,7 +1965,7 @@
- (void) fprintf(stderr, _("%s: command was '%s', result was %d\n"),
- progname, buf, result);
- for ( ; ; )
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
-
- static int
-@@ -2046,8 +2046,9 @@
- emalloc((int) ((strlen(cp) + 1) * sizeof *array));
- nsubs = 0;
- for ( ; ; ) {
-- while (isascii(*cp) && isspace((unsigned char) *cp))
-- ++cp;
-+ while (isascii((unsigned char) *cp) &&
-+ isspace((unsigned char) *cp))
-+ ++cp;
- if (*cp == '\0' || *cp == '#')
- break;
- array[nsubs++] = dp = cp;
-@@ -2080,7 +2081,7 @@
- t = t1 + t2;
- if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) {
- error(_("time overflow"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- return t;
- }
-@@ -2099,7 +2100,7 @@
- t = t1 + t2;
- if ((t2 > 0 && t <= t1) || (t2 < 0 && t >= t1)) {
- error(_("time overflow"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- return t;
- }
-@@ -2146,7 +2147,7 @@
- --i;
- else {
- error(_("use of 2/29 in non leap-year"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- }
- --i;
-@@ -2210,8 +2211,9 @@
- */
- cp = string;
- wp = NULL;
-- while (isascii(*cp) && isalpha(*cp))
-- ++cp;
-+ while (isascii((unsigned char) *cp) &&
-+ isalpha((unsigned char) *cp))
-+ ++cp;
- if (cp - string == 0)
- wp = _("time zone abbreviation lacks alphabetic at start");
- if (noise && cp - string > 3)
-@@ -2220,9 +2222,11 @@
- wp = _("time zone abbreviation has too many alphabetics");
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
- ++cp;
-- if (isascii(*cp) && isdigit(*cp))
-- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
-- ++cp;
-+ if (isascii((unsigned char) *cp) &&
-+ isdigit((unsigned char) *cp))
-+ if (*cp++ == '1' &&
-+ *cp >= '0' && *cp <= '4')
-+ ++cp;
- }
- if (*cp != '\0')
- wp = _("time zone abbreviation differs from POSIX standard");
-@@ -2238,7 +2242,7 @@
- i = strlen(string) + 1;
- if (charcnt + i > TZ_MAX_CHARS) {
- error(_("too many, or too long, time zone abbreviations"));
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- (void) strcpy(&chars[charcnt], string);
- charcnt += eitol(i);
-@@ -2302,7 +2306,7 @@
- (void) fprintf(stderr,
- _("%s: %d did not sign extend correctly\n"),
- progname, i);
-- (void) exit(EXIT_FAILURE);
-+ exit(EXIT_FAILURE);
- }
- return l;
- }
-Index: timezone/zone.tab
-===================================================================
---- timezone/zone.tab.orig
-+++ timezone/zone.tab
-@@ -1,4 +1,4 @@
--# @(#)zone.tab 1.32
-+# @(#)zone.tab 8.1
- #
- # TZ zone descriptions
- #
-@@ -100,8 +100,9 @@
- BY +5354+02734 Europe/Minsk
- BZ +1730-08812 America/Belize
- CA +4734-05243 America/St_Johns Newfoundland Island
--CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
-+CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), W Labrador, E Quebec & PEI
- CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
-+CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
- CA +5320-06025 America/Goose_Bay Atlantic Time - E Labrador
- CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
- CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
-@@ -370,12 +371,14 @@
- US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations
- US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area
- US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County
--US +394606-0860929 America/Indiana/Indianapolis Eastern Standard Time - Indiana - most locations
--US +382232-0862041 America/Indiana/Marengo Eastern Standard Time - Indiana - Crawford County
--US +411745-0863730 America/Indiana/Knox Eastern Standard Time - Indiana - Starke County
--US +384452-0850402 America/Indiana/Vevay Eastern Standard Time - Indiana - Switzerland County
-+US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations
-+US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County
-+US +411745-0863730 America/Indiana/Knox Eastern Time - Indiana - Starke County
-+US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County
- US +415100-0873900 America/Chicago Central Time
--US +450628-0873651 America/Menominee Central Time - Michigan - Wisconsin border
-+US +384038-0873143 America/Indiana/Vincennes Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski
-+US +382931-0871643 America/Indiana/Petersburg Central Time - Indiana - Pike County
-+US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
- US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County
- US +394421-1045903 America/Denver Mountain Time
- US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/patches/series 2006-04-08 19:53:46 UTC (rev 1352)
@@ -107,7 +107,6 @@
all/cvs-manual-memory.diff -p1
all/cvs-manual-string.diff -p1
-all/cvs-tzdata.diff -p0
all/locale-ru_RU.diff -p1
any/cvs-argp_h.diff -p1
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-04-08 19:50:25 UTC (rev 1351)
+++ glibc-package/trunk/debian/rules 2006-04-08 19:53:46 UTC (rev 1352)
@@ -118,7 +118,7 @@
curpass = $(filter-out %_,$(subst _,_ ,$@))
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin
-DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales tzdata
+DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
# Generic kernel version check
Reply to: