Remove the SCCS keyword '%W%' from all files. Mostly this just remove comments. Remove trailing white space, too. * Makefile (TZCODE_VERSION): New macro. (version.h): New rule. (tzselect): Interpolate TZCODE_VERSION. (clean): Remove version.h. (zdump.o, zic.o): Depend on version.h. * asctime.c, date.c, difftime.c, ialloc.c, localtime.c, scheck.c: * strftime.c, zdump.c, zic.c: Remove elsieid. * private.h: Remove privatehid. * tzfile.h: Remove tzfilehid. * tzselect.h (TZCODE_VERSION): Rename from VERSION. * zdump.c, zic.c: Include "version.h", and use TZCODE_VERSION instead of elsieid. --- Makefile | 15 ++++++++++++--- README | 1 - TESTS | 2 -- Theory | 1 - africa | 31 +++++++++++++++---------------- antarctica | 1 - asctime.c | 6 ------ asia | 1 - australasia | 1 - backward | 1 - checktab.awk | 2 -- date.1 | 1 - date.c | 9 --------- difftime.c | 6 ------ etcetera | 1 - europe | 1 - factory | 1 - gccdiffs | 2 -- hr435 | 1 - ialloc.c | 6 ------ iso3166.tab | 1 - leapseconds | 1 - localtime.c | 6 ------ newctime.3 | 1 - newstrftime.3 | 1 - newtzset.3 | 1 - northamerica | 1 - pacificnew | 1 - posix | 2 -- private.h | 10 ---------- scheck.c | 6 ------ solar87 | 1 - solar88 | 1 - solar89 | 1 - southamerica | 1 - strftime.c | 10 ---------- systemv | 1 - time2posix.3 | 1 - tz-art.htm | 3 --- tz-link.htm | 3 --- tzfile.5 | 1 - tzfile.h | 10 ---------- tzselect.8 | 1 - tzselect.ksh | 4 ++-- usno1988 | 2 -- usno1989 | 2 -- usno1989a | 2 -- usno1995 | 2 -- usno1997 | 2 -- usno1998 | 2 -- usno2004 | 2 -- workman.sh | 1 - yearistype.sh | 2 -- zdump.8 | 1 - zdump.c | 4 ++-- zic.8 | 1 - zic.c | 5 ++--- zone.tab | 1 - zoneinfo2tdf.pl | 2 -- 59 files changed, 33 insertions(+), 157 deletions(-) diff --git a/Makefile b/Makefile index 8ee7c94..f5854f5 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. +# Version number of this code distribution. +TZCODE_VERSION = tzcode2012b + # Change the line below for your time zone (after finding the zone you want in # the time zone files, or adding it to a time zone file). # Alternately, if you discover you've got the wrong time zone, you can just @@ -309,6 +311,10 @@ INSTALL: ALL install date.1 -rm -f $(MANDIR)/man1/date.1 cp date.1 $(MANDIR)/man1/. +version.h: + echo >$@ \ + 'static char const TZCODE_VERSION[]="$(TZCODE_VERSION)";' + zdump: $(TZDOBJS) $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ @@ -359,6 +365,7 @@ tzselect: tzselect.ksh sed \ -e 's|AWK=[^}]*|AWK=$(AWK)|g' \ -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ + -e 's|\(TZCODE_VERSION\)=.*|\1=$(TZCODE_VERSION)|' \ <$? >$@ chmod +x $@ @@ -371,7 +378,8 @@ check_web: $(WEB_PAGES) $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) $(WEB_PAGES) clean: - rm -f core *.o *.out tzselect zdump zic yearistype date + rm -f core *.o *.out \ + date tzselect version.h zdump zic yearistype maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -416,6 +424,7 @@ ialloc.o: private.h localtime.o: private.h tzfile.h scheck.o: private.h strftime.o: tzfile.h -zic.o: private.h tzfile.h +zdump.o: version.h +zic.o: private.h tzfile.h version.h .KEEP_STATE: diff --git a/README b/README index 1e9a872..f3a97f3 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ -%W% This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. diff --git a/TESTS b/TESTS index 83a554c..c6327e8 100644 --- a/TESTS +++ b/TESTS @@ -1,7 +1,5 @@ #! /bin/sh -# '%W%' - rm -f -r try mkdir try make `make names` diff --git a/Theory b/Theory index 3b24006..7094b27 100644 --- a/Theory +++ b/Theory @@ -1,4 +1,3 @@ -%W% This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. diff --git a/africa b/africa index ff843ca..6104815 100644 --- a/africa +++ b/africa @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -238,7 +237,7 @@ Rule Egypt 2006 only - Sep 21 23:00s 0 - # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Norgaard Welen (2007-08-15): [The following agree:] -# http://www.nentjes.info/Bill/bill5.htm +# http://www.nentjes.info/Bill/bill5.htm # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/020700000000000000... @@ -292,18 +291,18 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 - # in September. # From Steffen Thorsen (2009-08-11): -# We have been able to confirm the August change with the Egyptian Cabinet +# We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: # <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html"> # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # </a> -# +# # The Middle East News Agency # <a href="http://www.mena.org.eg/index.aspx"> # http://www.mena.org.eg/index.aspx # </a> # also reports "Egypt starts winter time on August 21" -# today in article numbered "71, 11/08/2009 12:25 GMT." +# today in article numbered "71, 11/08/2009 12:25 GMT." # Only the title above is available without a subscription to their service, # and can be found by searching for "winter" in their search engine # (at least today). @@ -482,7 +481,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 1912 # From Steffen Thorsen (2008-06-25): # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial # basis.... -# It seems that Mauritius observed daylight saving time from 1982-10-10 to +# It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful.... # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html @@ -506,12 +505,12 @@ Zone Africa/Nouakchott -1:03:48 - LMT 1912 # than previously announced (2008-11-01 to 2009-03-31). The new start # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time # given, but it is probably at either 2 or 3 wall clock time). -# -# A little strange though, since the article says that they moved the date -# to align itself with Europe and USA which also change time on that date, -# but that means they have not paid attention to what happened in -# USA/Canada last year (DST ends first Sunday in November). I also wonder -# why that they end on a Friday, instead of aligning with Europe which +# +# A little strange though, since the article says that they moved the date +# to align itself with Europe and USA which also change time on that date, +# but that means they have not paid attention to what happened in +# USA/Canada last year (DST ends first Sunday in November). I also wonder +# why that they end on a Friday, instead of aligning with Europe which # changes two days later. # From Alex Krivenyshev (2008-07-11): @@ -570,7 +569,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 1912 # </a> # From Arthur David Olson (2009-07-11): -# The "mauritius-dst-will-not-repeat" wrapup includes this: +# The "mauritius-dst-will-not-repeat" wrapup includes this: # "The trial ended on March 29, 2009, when the clocks moved back by one hour # at 2am (or 02:00) local time..." @@ -664,8 +663,8 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou # XXX--guess that it is only Morocco for now; guess only 2008 for now. # From Steffen Thorsen (2008-08-27): -# Morocco will change the clocks back on the midnight between August 31 -# and September 1. They originally planned to observe DST to near the end +# Morocco will change the clocks back on the midnight between August 31 +# and September 1. They originally planned to observe DST to near the end # of September: # # One article about it (in French): @@ -854,7 +853,7 @@ Zone Africa/Maputo 2:10:20 - LMT 1903 Mar # Forecasting Riaan van Zyl explained that the far eastern parts of # the country are close to 40 minutes earlier in sunrise than the rest # of the country. -# +# # From Paul Eggert (2007-03-31): # Apparently the Caprivi Strip informally observes Botswana time, but # we have no details. In the meantime people there can use Africa/Gaborone. diff --git a/antarctica b/antarctica index 93325aa..f55cbde 100644 --- a/antarctica +++ b/antarctica @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/asctime.c b/asctime.c index b7438fa..3d3f6b9 100644 --- a/asctime.c +++ b/asctime.c @@ -9,12 +9,6 @@ ** whereas the output of asctime is supposed to be constant. */ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - /*LINTLIBRARY*/ #include "private.h" diff --git a/asia b/asia index c382295..9e5904c 100644 --- a/asia +++ b/asia @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/australasia b/australasia index 0a169a4..d6f819d 100644 --- a/australasia +++ b/australasia @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/backward b/backward index 2b8457c..dc7769f 100644 --- a/backward +++ b/backward @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/checktab.awk b/checktab.awk index 1b17d1c..c88b12f 100644 --- a/checktab.awk +++ b/checktab.awk @@ -1,7 +1,5 @@ # Check tz tables for consistency. -# %W% - # Contributed by Paul Eggert. BEGIN { diff --git a/date.1 b/date.1 index da0f163..408525c 100644 --- a/date.1 +++ b/date.1 @@ -172,6 +172,5 @@ If is absent, UTC leap seconds are loaded from .BR /usr/local/etc/zoneinfo/posixrules . -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/date.c b/date.c index 93434ba..5a2346e 100644 --- a/date.c +++ b/date.c @@ -1,12 +1,3 @@ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -/* -** Modified from the UCB version with the SCCS ID appearing below. -*/ -#endif /* !defined NOID */ -#endif /* !defined lint */ - /* * Copyright (c) 1985, 1987, 1988 The Regents of the University of California. * All rights reserved. diff --git a/difftime.c b/difftime.c index 95fb65c..59e3351 100644 --- a/difftime.c +++ b/difftime.c @@ -3,12 +3,6 @@ ** 1996-06-05 by Arthur David Olson. */ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - /*LINTLIBRARY*/ #include "private.h" /* for time_t, TYPE_INTEGRAL, and TYPE_SIGNED */ diff --git a/etcetera b/etcetera index dd8ce81..a9ff729 100644 --- a/etcetera +++ b/etcetera @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/europe b/europe index ceb7306..d600ea0 100644 --- a/europe +++ b/europe @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/factory b/factory index a8be4c1..d29a585 100644 --- a/factory +++ b/factory @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/gccdiffs b/gccdiffs index 72216a0..04bb6be 100644 --- a/gccdiffs +++ b/gccdiffs @@ -1,5 +1,3 @@ -%W% - Here are changes to GNU's gcc-2.7.2.1 "c-common.c" file that allow strftime formats to be checked against what GNU's glibc-1.09.1 "strftime" accepts. Formats are also checked for specifications that may or must print only the diff --git a/hr435 b/hr435 index 92d1d6b..7dd047d 100644 --- a/hr435 +++ b/hr435 @@ -1,4 +1,3 @@ -.. %W% .nh .na .if n .ds lq \&"\" diff --git a/ialloc.c b/ialloc.c index 3eced54..0268cf4 100644 --- a/ialloc.c +++ b/ialloc.c @@ -3,12 +3,6 @@ ** 2006-07-17 by Arthur David Olson. */ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - /*LINTLIBRARY*/ #include "private.h" diff --git a/iso3166.tab b/iso3166.tab index cff772b..b952ca1 100644 --- a/iso3166.tab +++ b/iso3166.tab @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # ISO 3166 alpha-2 country codes diff --git a/leapseconds b/leapseconds index d905fa8..6a914df 100644 --- a/leapseconds +++ b/leapseconds @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/localtime.c b/localtime.c index 1b00f29..93ef8a8 100644 --- a/localtime.c +++ b/localtime.c @@ -3,12 +3,6 @@ ** 1996-06-05 by Arthur David Olson. */ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - /* ** Leap second handling from Bradley White. ** POSIX-style TZ environment variable handling from Guy Harris. diff --git a/newctime.3 b/newctime.3 index 71b938d..3583a91 100644 --- a/newctime.3 +++ b/newctime.3 @@ -236,6 +236,5 @@ instead. Avoid using out-of-range values with .I mktime when setting up lunch with promptness sticklers in Riyadh. -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/newstrftime.3 b/newstrftime.3 index 6a8e68f..ef79e4d 100644 --- a/newstrftime.3 +++ b/newstrftime.3 @@ -227,4 +227,3 @@ newctime(3), newtzset(3), time(2), tzfile(5) -.\" %W% diff --git a/newtzset.3 b/newtzset.3 index 6bf028d..fd6b677 100644 --- a/newtzset.3 +++ b/newtzset.3 @@ -234,6 +234,5 @@ newctime(3), newstrftime(3), time(2), tzfile(5) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/northamerica b/northamerica index ee1c97d..84876c9 100644 --- a/northamerica +++ b/northamerica @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/pacificnew b/pacificnew index 5a528a1..bccd852 100644 --- a/pacificnew +++ b/pacificnew @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/posix b/posix index a361978..1a78edd 100644 --- a/posix +++ b/posix @@ -1,5 +1,3 @@ -# %W% - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule POSIX 1970 1973 - Apr lastSun 2:00 1:00 D Rule POSIX 1974 only - Jan 6 2:00 1:00 D diff --git a/private.h b/private.h index 8b365a7..f0e2e6d 100644 --- a/private.h +++ b/private.h @@ -15,16 +15,6 @@ ** Thank you! */ -/* -** ID -*/ - -#ifndef lint -#ifndef NOID -static char privatehid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - #define GRANDPARENTED "Local time zone must be set--see zic manual page" /* diff --git a/scheck.c b/scheck.c index 3e01367..8e7737f 100644 --- a/scheck.c +++ b/scheck.c @@ -3,12 +3,6 @@ ** 2006-07-17 by Arthur David Olson. */ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -#endif /* !defined lint */ -#endif /* !defined NOID */ - /*LINTLIBRARY*/ #include "private.h" diff --git a/solar87 b/solar87 index eeb18a5..2299558 100644 --- a/solar87 +++ b/solar87 @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/solar88 b/solar88 index 41d7d70..bb1d6ca 100644 --- a/solar88 +++ b/solar88 @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/solar89 b/solar89 index 9c11064..af93235 100644 --- a/solar89 +++ b/solar89 @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/southamerica b/southamerica index 789bbb7..ff6b2f0 100644 --- a/southamerica +++ b/southamerica @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/strftime.c b/strftime.c index 37d402f..e8c8b82 100644 --- a/strftime.c +++ b/strftime.c @@ -1,13 +1,3 @@ -#ifndef lint -#ifndef NOID -static char elsieid[] = "%W%"; -/* -** Based on the UCB version with the ID appearing below. -** This is ANSIish only when "multibyte character == plain character". -*/ -#endif /* !defined NOID */ -#endif /* !defined lint */ - #include "private.h" /* diff --git a/systemv b/systemv index ef19139..e651e85 100644 --- a/systemv +++ b/systemv @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/time2posix.3 b/time2posix.3 index de54e4a..e17b011 100644 --- a/time2posix.3 +++ b/time2posix.3 @@ -116,6 +116,5 @@ difftime(3), localtime(3), mktime(3), time(2) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 1996-06-05 by Arthur David Olson. diff --git a/tz-art.htm b/tz-art.htm index 904c0e7..342fd97 100644 --- a/tz-art.htm +++ b/tz-art.htm @@ -8,9 +8,6 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN" </head> <body> <h1>Time and the Arts</h1> -<address> -%W% -</address> <p> This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. diff --git a/tz-link.htm b/tz-link.htm index 4d7f42c..6588492 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -17,9 +17,6 @@ </head> <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> -<address> -%W% -</address> <p> This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. diff --git a/tzfile.5 b/tzfile.5 index e64d561..aa7317b 100644 --- a/tzfile.5 +++ b/tzfile.5 @@ -147,6 +147,5 @@ after the last transition time stored in the file such instants). .SH SEE ALSO newctime(3) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 1996-06-05 by Arthur David Olson. diff --git a/tzfile.h b/tzfile.h index 59782f1..0f6c687 100644 --- a/tzfile.h +++ b/tzfile.h @@ -16,16 +16,6 @@ */ /* -** ID -*/ - -#ifndef lint -#ifndef NOID -static char tzfilehid[] = "%W%"; -#endif /* !defined NOID */ -#endif /* !defined lint */ - -/* ** Information about time zone files. */ diff --git a/tzselect.8 b/tzselect.8 index e63d903..0d02590 100644 --- a/tzselect.8 +++ b/tzselect.8 @@ -38,6 +38,5 @@ The exit status is zero if a time zone was successfully obtained from the user, nonzero otherwise. .SH "SEE ALSO" newctime(3), tzfile(5), zdump(8), zic(8) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/tzselect.ksh b/tzselect.ksh index 3a7e3da..3ebaaa7 100644 --- a/tzselect.ksh +++ b/tzselect.ksh @@ -1,6 +1,6 @@ #! /bin/ksh -VERSION='%W%' +TZCODE_VERSION=see_Makefile # Ask the user about the time zone, and output the resulting TZ value to stdout. # Interact with the user via stderr and stdin. @@ -55,7 +55,7 @@ EOF exit 0 elif [ "$1" = "--version" ]; then cat <<EOF -tzselect $VERSION +tzselect $TZCODE_VERSION EOF exit 0 fi diff --git a/usno1988 b/usno1988 index ae0c38d..d2e6845 100644 --- a/usno1988 +++ b/usno1988 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1989-01-19): # # Here's some United States Naval Observatory time zone data from diff --git a/usno1989 b/usno1989 index 80b2307..76f51fd 100644 --- a/usno1989 +++ b/usno1989 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1989-01-19): # # Here's time zone information from the United States Naval Observatory; diff --git a/usno1989a b/usno1989a index 499b7a4..b26a9d5 100644 --- a/usno1989a +++ b/usno1989a @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1994-02-07): # # Here's time zone information from the United States Naval Observatory, diff --git a/usno1995 b/usno1995 index fbfdde8..e39aa52 100644 --- a/usno1995 +++ b/usno1995 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1995-12-21): # # Here's time zone information from the United States Naval Observatory diff --git a/usno1997 b/usno1997 index 605451e..ac63df5 100644 --- a/usno1997 +++ b/usno1997 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1997-03-07): # # Here's time zone information from the United States Naval Observatory diff --git a/usno1998 b/usno1998 index d759f70..62264a1 100644 --- a/usno1998 +++ b/usno1998 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (1998-05-26): # # Here's time zone information from the United States Naval Observatory diff --git a/usno2004 b/usno2004 index 591c334..08b6e3a 100644 --- a/usno2004 +++ b/usno2004 @@ -1,5 +1,3 @@ -# %W% -# # From Arthur David Olson (2004-10-14): # # Here's time zone information from the United States Naval Observatory diff --git a/workman.sh b/workman.sh index 1c6ed8b..7675dc1 100644 --- a/workman.sh +++ b/workman.sh @@ -1,7 +1,6 @@ #! /bin/sh # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. diff --git a/yearistype.sh b/yearistype.sh index 4a797ce..bdc6e58 100644 --- a/yearistype.sh +++ b/yearistype.sh @@ -3,8 +3,6 @@ : 'This file is in the public domain, so clarified as of' : '2006-07-17 by Arthur David Olson.' -: '%W%' - case $#-$1 in 2-|2-0*|2-*[!0-9]*) echo "$0: wild year - $1" >&2 diff --git a/zdump.8 b/zdump.8 index 65f3453..63349e4 100644 --- a/zdump.8 +++ b/zdump.8 @@ -54,6 +54,5 @@ This works in all real-world cases; one can construct artificial time zones for which this fails. .SH "SEE ALSO" newctime(3), tzfile(5), zic(8) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/zdump.c b/zdump.c index 5a88270..cbd3338 100644 --- a/zdump.c +++ b/zdump.c @@ -3,7 +3,7 @@ ** 2009-05-17 by Arthur David Olson. */ -static char elsieid[] = "%W%"; +#include "version.h" /* ** This code has been made independent of the rest of the time @@ -282,7 +282,7 @@ char * argv[]; progname = argv[0]; for (i = 1; i < argc; ++i) if (strcmp(argv[i], "--version") == 0) { - (void) printf("%s\n", elsieid); + (void) printf("%s\n", TZCODE_VERSION); exit(EXIT_SUCCESS); } else if (strcmp(argv[i], "--help") == 0) { usage(stdout, EXIT_SUCCESS); diff --git a/zic.8 b/zic.8 index 579c996..d61555e 100644 --- a/zic.8 +++ b/zic.8 @@ -493,6 +493,5 @@ specifying transition instants using universal time. /usr/local/etc/zoneinfo standard directory used for created files .SH "SEE ALSO" newctime(3), tzfile(5), zdump(8) -.\" %W% .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/zic.c b/zic.c index 9ac7de8..28d7bcf 100644 --- a/zic.c +++ b/zic.c @@ -3,8 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static char elsieid[] = "%W%"; - +#include "version.h" #include "private.h" #include "locale.h" #include "tzfile.h" @@ -498,7 +497,7 @@ char * argv[]; } for (i = 1; i < argc; ++i) if (strcmp(argv[i], "--version") == 0) { - (void) printf("%s\n", elsieid); + (void) printf("%s\n", TZCODE_VERSION); exit(EXIT_SUCCESS); } else if (strcmp(argv[i], "--help") == 0) { usage(stdout, EXIT_SUCCESS); diff --git a/zone.tab b/zone.tab index 0d7f950..6bda826 100644 --- a/zone.tab +++ b/zone.tab @@ -1,5 +1,4 @@ # <pre> -# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # diff --git a/zoneinfo2tdf.pl b/zoneinfo2tdf.pl index cf7b4dc..3192e0c 100755 --- a/zoneinfo2tdf.pl +++ b/zoneinfo2tdf.pl @@ -1,7 +1,5 @@ #! /usr/bin/perl -w -# %W% - # Courtesy Ken Pizzini. use strict; -- 1.7.9.5