From db456a1164ec08c60c4440b72a265ff1f7419ce3 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 22 Aug 2016 09:58:37 -0700
Subject: [PROPOSED PATCH] Use xz format for new tarball

This should be a bit easier to use on MS-Windows.
See Oscar van Vlijmen's note in:
http://mm.icann.org/pipermail/tz/2016-August/023945.html
* Makefile (maintainer-clean): Clean out all .tar.* files.
(tzdb-$(VERSION).tar.xz, tzdb-$(VERSION).tar.xz.asc):
Rename from .lz extension and use xz format.  All uses changed.
* NEWS: Update to .xz.
---
 Makefile | 12 ++++++------
 NEWS     |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 98024d0..b71211e 100644
--- a/Makefile
+++ b/Makefile
@@ -573,7 +573,7 @@ clean:		clean_misc
 maintainer-clean: clean
 		@echo 'This command is intended for maintainers to use; it'
 		@echo 'deletes files that may need special tools to rebuild.'
-		rm -f leapseconds $(MANTXTS) $(TZS) *.asc *.tar.[gl]z
+		rm -f leapseconds $(MANTXTS) $(TZS) *.asc *.tar.*
 
 names:
 		@echo $(ENCHILADA)
@@ -673,7 +673,7 @@ check_time_t_alternatives:
 		rm -fr time_t.dir
 
 tarballs:	tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz \
-		tzdb-$(VERSION).tar.lz
+		tzdb-$(VERSION).tar.xz
 
 tzcode$(VERSION).tar.gz: set-timestamps.out
 		LC_ALL=C && export LC_ALL && \
@@ -686,16 +686,16 @@ tzdata$(VERSION).tar.gz: set-timestamps.out
 		tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) $(TZS) | \
 		  gzip $(GZIPFLAGS) > $@
 
-tzdb-$(VERSION).tar.lz: set-timestamps.out
+tzdb-$(VERSION).tar.xz: set-timestamps.out
 		rm -fr tzdb
 		mkdir tzdb
 		ln $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) $(TZS) tzdb
 		touch -cmr $$(ls -t tzdb/* | sed 1q) tzdb
 		LC_ALL=C && export LC_ALL && \
-		tar $(TARFLAGS) -cf - tzdb | lzip -9 > $@
+		tar $(TARFLAGS) -cf - tzdb | xz -9e > $@
 
 signatures:	tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
-		tzdb-$(VERSION).tar.lz.asc
+		tzdb-$(VERSION).tar.xz.asc
 
 tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
 		gpg --armor --detach-sign $?
@@ -703,7 +703,7 @@ tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
 tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
 		gpg --armor --detach-sign $?
 
-tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
+tzdb-$(VERSION).tar.xz.asc: tzdb-$(VERSION).tar.xz
 		gpg --armor --detach-sign $?
 
 typecheck:
diff --git a/NEWS b/NEWS
index 8725e49..548de8f 100644
--- a/NEWS
+++ b/NEWS
@@ -47,14 +47,15 @@ Unreleased, experimental changes
     'make check' now checks that zdump generates this output.
 
     A new distribution format is available in the tarball
-    tzdb-VERSION.tar.lz and the signature tzdb-VERSION.tar.lz.asc.
+    tzdb-VERSION.tar.xz and the signature tzdb-VERSION.tar.xz.asc.
     The new tarball has the contents of tzcodeVERSION.tar.gz and
     tzdataVERSION.tar.gz, in a single top-level directory 'tzdb' with
     all other files under this directory, as is typical for software
     distributions.  The new format is intended to replace the old
     tarball pair.  The old format will continue to be distributed for
-    a while.  The new format uses lzip compression, which is
-    significantly smaller than gzip and is simpler than xz.
+    a while.  The new format uses xz compression, which is
+    significantly smaller than gzip.  (Thanks to Oscar van Vlijmen for
+    comments on the format.)
 
   Changes to documentation and commentary
 
-- 
2.7.4