From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 24 Apr 2017 18:05:18 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/xz'
X-Git-Tag: v0.6.0~6
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=64411efdbd90f1080ad1fd010d468cea63aec923

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.
---

64411efdbd90f1080ad1fd010d468cea63aec923
diff --cc Makefile.real
index d2d31667,23d73076..29c4bae7
--- a/Makefile.real
+++ b/Makefile.real
@@@ -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
@@@ -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
diff --cc NEWS.md
index 9b6ef0a7,2056f90c..39022ad9
--- a/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"
  -------------------------------------