Switch to xz to compress tarballs.

xz compresses better than bzip2, and decompression needs less time. It
is also widely used by many other software projects, so there should
be no disadvantage.

We keep removing the .bz2 tarball on make clean, and also keep the
paraslash-*.tar.bz2 entry in .gitignore for the time being.

diff --git a/.gitignore b/.gitignore
index 10a7a8a91d570d5d9d16a18c1c1d896334adc7b4..10d2572d926ab11ec8de95fa32649aa00f4bf1c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ config.status
 Makefile
 TODO
 paraslash-*.tar.bz2
+paraslash-*.tar.xz
 web/dia/overview.pdf
 *.swp
 *.rej

diff --git a/Makefile.real b/Makefile.real
index 8ededf6aff8300608a5939429779ecd7b1753626..23d73076f75fb4ef1b2fd051bcf81444e4dfdbfd 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -61,7 +61,7 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 autocrap := config.h.in configure
 tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
-tarball := $(tarball_pfx).tar.bz2
+tarball := $(tarball_pfx).tar.xz
 
 .PHONY: all clean clean2 distclean maintainer-clean install man tarball
 all: $(prefixed_executables) $(man_pages)
@@ -352,7 +352,7 @@ distclean: clean2 test-clean
 
 maintainer-clean: distclean
        @[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-       $(Q) rm -f *.tar.bz2 config.h configure config.h.in
+       $(Q) rm -f *.tar.bz2 *.tar.xz config.h configure config.h.in
 
 install: all man
        $(MKDIR_P) $(bindir) $(mandir)
@@ -369,7 +369,7 @@ $(tarball):
        $(Q) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
        $(Q) cp $(autocrap) $(tarball_pfx)
        $(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-       $(Q) bzip2 -9 $(tarball_pfx).tar
+       $(Q) xz -9 $(tarball_pfx).tar
        $(Q) ls -l $(tarball)
-       $(Q) ln -sf $(tarball) paraslash-git.tar.bz2
+       $(Q) ln -sf $(tarball) paraslash-git.tar.xz
        $(Q) rm -rf $(tarball_pfx)

diff --git a/web/.htaccess b/web/.htaccess
index 425c2190d1798557138f605a9de43b94412f88cd..2b7fe2217b51b1d54fefc2a005b5e3ad509a65d9 100644 (file)
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -6,7 +6,7 @@
        AddIcon ../signature.png *.asc
        AddDescription "Digital signature" *.asc
 
-       AddIcon ../tar-icon.png *.tgz *.tar.bz2
-       AddDescription "current master snapshot" -git.tar.bz2 .g*.tar.bz2 .g*.dirty.tar.bz2
-       AddDescription "release tarball" *.tgz *.tar.bz2
+       AddIcon ../tar-icon.png *.tgz *.tar.bz2 *.tar.xz
+       AddDescription "current master snapshot" -git.tar.xz .g*.tar.xz .g*.dirty.tar.xz
+       AddDescription "release tarball" *.tgz *.tar.bz2 *.tar.xz
 </ifmodule>

diff --git a/web/download.in.html b/web/download.in.html
index a09fd1c868f5c9aa1eabd9b004d00dc30754d256..57ef29b28c7f0706fa3a3160d8186842e6684ae2 100644 (file)
--- a/web/download.in.html
+++ b/web/download.in.html
@@ -52,7 +52,7 @@ provided at this point. There are several ways to download the source:
 
                Whenever significant changes are incorporated a
 
-               <a href="releases/paraslash-git.tar.bz2">tarball</a>
+               <a href="releases/paraslash-git.tar.xz">tarball</a>
 
                of the current master branch is created. All changes in
                this tarball will be included in the next release. Like