Merge branch 'refs/heads/t/xz'

A single patch which modifies the build system to create xz-compressed
tarballs. The patch conflicted against the changes introduced by the
recently merged makefile_conventions topic branch.

Cooking for almost a month.

* refs/heads/t/xz:
  Switch to xz to compress tarballs.

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 d2d316673d4dba08e650f2ecf28d075d8bcacc8f..29c4bae7e8e593debbe45afd62e143b66c75c218 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -60,7 +60,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
 
 all: $(prefixed_executables) $(man_pages)
 .PHONY: all mostlyclean clean distclean maintainer-clean install \
@@ -339,7 +339,7 @@ distclean: clean
        $(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
        @[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-       $(Q) rm -f *.tar.bz2
+       $(Q) rm -f *.tar.bz2 *.tar.xz
        $(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 INSTALL ?= install
@@ -363,7 +363,7 @@ $(tarball) dist 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/NEWS.md b/NEWS.md
index 9b6ef0a7e9d23e8ef08a078afa74da86ef47828a..39022ad955426c12f68126a875c217b217f90c81 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -34,6 +34,8 @@ NEWS
   the new field.
 - No more chunk tables for aac. Chunk boundaries are determined
   dynamically at stream time.
+- Release and master branch tarballs are now compressed with xz rather
+  than bzip2.
 
 Downloads:
 [tarball](./releases/paraslash-git.tar.bz2),

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 c6ba266bfb834790e9f1fd868bf020412b4e0a4e..1ca8a4d20c4624fe8e67dcbacd4e1f16c6f5931d 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