[tz] [PATCH] * CONTRIBUTING: New file.

Paul Eggert eggert at cs.ucla.edu
Tue Aug 12 08:14:50 UTC 2014


Alan Barrett wrote:
> Please could you also include "Theory" in the tzdata tarball.

Sure.  I pushed the attached patches into the experimental version.  The 
2nd one checks the new file CONTRIBUTING better.
-------------- next part --------------
From bc9b5b89147d5ac801f633aeca216e1aa63c0c9e Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Tue, 12 Aug 2014 01:10:09 -0700
Subject: [PATCH 1/2] Distribute Theory as part of the tzdata tarball too.

(Suggested by Alan Barrett.)
* Makefile (COMMON): Move Theory here ...
(DOCS): From here.
* NEWS: Document this.
---
 Makefile |  4 ++--
 NEWS     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 42d53eb..24d523e 100644
--- a/Makefile
+++ b/Makefile
@@ -333,9 +333,9 @@ MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 			time2posix.3.txt \
 			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
 			date.1.txt
-COMMON=		CONTRIBUTING Makefile README NEWS
+COMMON=		CONTRIBUTING Makefile README NEWS Theory
 WEB_PAGES=	tz-art.htm tz-link.htm
-DOCS=		Theory $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
+DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
 PRIMARY_YDATA=	africa antarctica asia australasia \
 		europe northamerica southamerica
 YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
diff --git a/NEWS b/NEWS
index 28902c9..042f69a 100644
--- a/NEWS
+++ b/NEWS
@@ -28,12 +28,12 @@ Unreleased, experimental changes
 
     The files checktab.awk and zoneinfo2tdf.pl are now distributed in
     the tzdata tarball instead of the tzcode tarball, since they help
-    maintain the data.  The NEWS file is now also distributed in the
-    tzdata tarball, since it contains news for data too.  (Thanks to
-    Alan Barrett for pointing this out.)  Also, the leapseconds.awk
-    file is no longer distributed in the tzcode tarball, since it
-    belongs in the tzdata tarball (where 2014f inadvertently also
-    distributed it).
+    maintain the data.  The NEWS and Theory files are now also
+    distributed in the tzdata tarball, as they're relevant for data.
+    (Thanks to Alan Barrett for pointing this out.)  Also, the
+    leapseconds.awk file is no longer distributed in the tzcode
+    tarball, since it belongs in the tzdata tarball (where 2014f
+    inadvertently also distributed it).
 
   Changes affecting documentation and commentary
 
-- 
1.9.1
-------------- next part --------------
From 3b4c54b5b7d653d0b40b0875639ef91ca5b8c156 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Tue, 12 Aug 2014 01:12:34 -0700
Subject: [PATCH 2/2] * Makefile (check_character_set): Check CONTRIBUTING like
 README.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 24d523e..57649c6 100644
--- a/Makefile
+++ b/Makefile
@@ -333,7 +333,7 @@ MANTXTS=	newctime.3.txt newstrftime.3.txt newtzset.3.txt \
 			time2posix.3.txt \
 			tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
 			date.1.txt
-COMMON=		CONTRIBUTING Makefile README NEWS Theory
+COMMON=		CONTRIBUTING Makefile NEWS README Theory
 WEB_PAGES=	tz-art.htm tz-link.htm
 DOCS=		$(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
 PRIMARY_YDATA=	africa antarctica asia australasia \
@@ -460,8 +460,8 @@ check_character_set: $(ENCHILADA)
 		! grep -Env $(SAFE_SHARP_LINE) $(YDATA) $(NDATA) iso3166.tab \
 			zone.tab leapseconds yearistype.sh && \
 		test $$(grep -Ecv $(SAFE_SHARP_LINE) Makefile) -eq 1 && \
-		! grep -Env $(NONSYM_LINE) README NEWS Theory $(MANS) date.1 \
-			zone1970.tab && \
+		! grep -Env $(NONSYM_LINE) CONTRIBUTING NEWS README Theory \
+			$(MANS) date.1 zone1970.tab && \
 		! grep -Env $(VALID_LINE) $(ENCHILADA)
 
 check_white_space: $(ENCHILADA)
-- 
1.9.1


More information about the tz mailing list