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 --combined Makefile.real
index d2d316673d4dba08e650f2ecf28d075d8bcacc8f,23d73076f75fb4ef1b2fd051bcf81444e4dfdbfd..29c4bae7e8e593debbe45afd62e143b66c75c218
--- 1/Makefile.real
--- 2/Makefile.real
+++ b/Makefile.real
@@@ -9,6 -9,7 +9,6 @@@ endi
  
  vardir := /var/paraslash
  mandir := $(datarootdir)/man/man1
 -STRIP := $(CROSS_COMPILE)strip
  MKDIR_P := mkdir -p
  prefixed_executables := $(addprefix para_, $(executables))
  
@@@ -60,13 -61,12 +60,13 @@@ man_pages := $(patsubst %, $(man_dir)/%
  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)
 +.PHONY: all mostlyclean clean distclean maintainer-clean install \
 +      install-strip man dist tarball
 +
  man: $(man_pages)
 -tarball: $(tarball)
  
  include $(m4_ggo_dir)/makefile
  include $(test_dir)/makefile.test
@@@ -113,6 -113,8 +113,6 @@@ STRICT_CFLAGS += -Wformat -Wformat-secu
  STRICT_CFLAGS += -Wmissing-format-attribute
  STRICT_CFLAGS += -Wdeclaration-after-statement
  
 -LDFLAGS += $(clock_gettime_ldflags)
 -
  ifeq ($(uname_s),Linux)
        # these cause warnings on *BSD
        CPPFLAGS += -Wunused-macros
@@@ -204,6 -206,7 +204,6 @@@ $(object_dir)/mp3_afh.o $(dep_dir)/mp3_
  $(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags)
  $(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags)
  $(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags)
 -$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d: CPPFLAGS += $(mp4v2_cppflags)
  $(object_dir)/alsa%.o $(dep_dir)/alsa%.d: CPPFLAGS += $(alsa_cppflags)
  
  $(object_dir)/interactive.o $(dep_dir)/interactive.d \
@@@ -222,6 -225,7 +222,6 @@@ $(object_dir)/mp3dec_filter.o $(dep_dir
  : CPPFLAGS += $(mad_cppflags)
  
  $(object_dir)/aacdec_filter.o $(dep_dir)/aacdec_filter.d \
 -$(object_dir)/aac_common.o $(dep_dir)/aac_common.d \
  $(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d \
  : CPPFLAGS += $(faad_cppflags)
  
@@@ -278,7 -282,7 +278,7 @@@ $(dep_dir)/%.d: %.c | $(dep_dir
  
  para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
  para_write para_play para_audiod \
 -: LDFLAGS += $(ao_ldflags) $(pthread_ldflags) $(core_audio_ldflags)
 +: LDFLAGS += $(ao_ldflags) $(pthread_ldflags)
  para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
  para_server: LDFLAGS += $(osl_ldflags)
  para_gui: LDFLAGS += $(curses_ldflags)
@@@ -319,6 -323,13 +319,6 @@@ para_recv 
        $(faad_ldflags) \
        $(flac_ldflags)
  
 -para_server \
 -para_play \
 -para_afh \
 -para_recv \
 -: LDFLAGS += \
 -      $(mp4v2_ldflags)
 -
  para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
  
  $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))
@@@ -326,36 -337,31 +326,36 @@@ $(prefixed_executables)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $^ -o $@ $(LDFLAGS)
  
 -clean:
 -      @[ -z "$(Q)" ] || echo 'CLEAN'
 +mostlyclean:
 +      @[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
        $(Q) rm -f para_*
        $(Q) rm -rf $(object_dir)
 -
 -clean2: clean
 -      @[ -z "$(Q)" ] || echo 'CLEAN2'
 +clean: mostlyclean
 +      @[ -z "$(Q)" ] || echo 'CLEAN'
        $(Q) rm -rf $(build_dir)
 -distclean: clean2 test-clean
 +distclean: clean
        @[ -z "$(Q)" ] || echo 'DISTCLEAN'
        $(Q) rm -f Makefile autoscan.log config.status config.log
 -      $(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 -
 +      $(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 config.h configure config.h.in
++      $(Q) rm -f *.tar.bz2 *.tar.xz
 +      $(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 +
 +INSTALL ?= install
 +INSTALL_PROGRAM ?= $(INSTALL)
 +INSTALL_DATA ?= $(INSTALL) -m 644
 +ifneq ($(findstring strip, $(MAKECMDGOALS)),)
 +      strip_option := -s
 +endif
  
 -install: all man
 -      $(MKDIR_P) $(bindir) $(mandir)
 -      $(INSTALL) -s --strip-program $(STRIP) -m 755 \
 -              $(prefixed_executables) $(bindir)
 -      $(INSTALL) -m 644 $(man_pages) $(mandir)
 -      $(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 +install install-strip: all man
 +      $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
 +      $(INSTALL) $(strip_option) $(prefixed_executables) $(DESTDIR)$(bindir)
 +      $(INSTALL_DATA) $(man_pages) $(DESTDIR)$(mandir)
 +      $(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
  
 -$(tarball):
 +$(tarball) dist tarball:
        $(Q) rm -rf $(tarball) $(tarball_pfx)
        $(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
                | tar --delete $(tarball_delete) > $(tarball_pfx).tar
@@@ -363,7 -369,7 +363,7 @@@
        $(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 --combined NEWS.md
index 9b6ef0a7e9d23e8ef08a078afa74da86ef47828a,2056f90c06716f40f67fa43d477e63787e780ddb..39022ad955426c12f68126a875c217b217f90c81
--- 1/NEWS.md
--- 2/NEWS.md
+++ b/NEWS.md
@@@ -1,43 -1,6 +1,45 @@@
  NEWS
  ====
  
 +------------------------------------
 +0.6.0 (to be announced) "fuzzy flux"
 +------------------------------------
 +- Support for Mac OS X has been removed.
 +- On Linux systems, glibc-2.17 or newer is required to build the
 +  source tree.
 +- Support for RSA public keys in ASN format (as generated by openssl
 +  genrsa) has been removed. These keys have been deprecated since
 +  2011, so users should have long switched to keys generated with
 +  ssh-keygen(1).
 +- If libgcrypt is used as the crypto library, we now require version
 +  1.5.0 (released in 2011) or later.
 +- The insecure RC4 stream cipher has been removed. It was superseded
 +  by aes_ctr128 three years ago but the RC4 code had been kept for
 +  backwards compatibility.
 +- On Linux, abstract unix domain sockets are used unconditionally.
 +- The "install" target no longer strips executables, the new
 +  install-strip target can be used to get the old behaviour.
 +- The clean targets have been renamed: clean2 is gone, and the new
 +  mostlyclean removes only the executables and object files.
 +- New target: check (identical to test).
 +- The DESTDIR make variable is honored to prepend a path to the
 +  installation directory. This feature is orthogonal to the --prefix
 +  option to configure.
 +- Minor WMA cleanups.
 +- The aac audio format handler has been rewritten to use the mp4ff library.
 +  See the manual for how to install the library on your system.
 +- New status item: max_chunk_size. The value is stored in a previously
 +  unused field of the afhi object of the aft table. Although backwards
 +  compatible, users are encouraged to re-add m4a files to populate
 +  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),
 +
  -------------------------------------
  0.5.7 (2016-12-31) "semantic density"
  -------------------------------------

diff --combined web/download.in.html
index c6ba266bfb834790e9f1fd868bf020412b4e0a4e,57ef29b28c7f0706fa3a3160d8186842e6684ae2..1ca8a4d20c4624fe8e67dcbacd4e1f16c6f5931d
--- 1/web/download.in.html
--- 2/web/download.in.html
+++ b/web/download.in.html
@@@ -9,9 -9,9 +9,9 @@@ provided at this point. There are sever
  
                Clone the git repository by executing
  
 -              <p> <pre> <kbd>
 +              <pre> <kbd>
                        git clone git://git.tuebingen.mpg.de/paraslash.git
 -              </kbd> </pre> </p>
 +              </kbd> </pre>
  
                <p> The repository contains the full history of the
                project since 2006, all work in progress and the source
@@@ -52,7 -52,7 +52,7 @@@
  
                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