* Antonio Diaz Diaz wrote on Sat, Feb 20, 2010 at 09:02:32PM CET: > Ralf Wildenhues wrote: > >Thanks for the patch. Care to add a ChangeLog entry? > > I'll happily do so. You can find it in the attached file.
Thanks, also for the timing testing. I'm adding a NEWS entry and applying your patch to a new lzip-support branch off of the (unpublished, but you can get at it easily through master^2 from a merge) maint branch, and merging that to master. Due to the changes in dist handling in master, this was a nontrivial merge, the interesting part shown below. Pushed master. Not yet sure whether this warrants backporting to branch-1.11 but anyway we should first wait and see whether problems in master show up. Thanks again, Ralf commit 4147afc1cfed700fbcbefb797ae98a7ee7e5602a Merge: d309207 3c3ff95 Author: Ralf Wildenhues <[email protected]> Date: Wed Feb 24 19:56:26 2010 +0100 Merge branch 'lzip-support' * lzip-support: Add lzip compression support. diff --cc NEWS index ebb52d6,5374770..4f8f8bb --- a/NEWS +++ b/NEWS @@@ -15,9 -5,9 +15,11 @@@ New in 1.11a - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - "make dist" can now create lzip-compressed tarballs. + -Bugs fixed in 1.11.0a: +Bugs fixed in 1.11a: + + - Lots of minor bugfixes. * Bugs introduced by 1.11: diff --cc lib/am/distdir.am index 4e356b9,ad051c3..9459e75 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@@ -346,8 -342,14 +346,14 @@@ dist-gzip: distdi .PHONY: dist-bzip2 dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) + ?LZIP?DIST_ARCHIVES += $(distdir).tar.lz + .PHONY: dist-lzip + dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz - $(am__remove_distdir) ++ $(am__post_remove_distdir) + ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma .PHONY: dist-lzma dist-lzma: distdir @@@ -377,15 -379,7 +383,16 @@@ dist-shar: distdi dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) + +?LZMA?DIST_TARGETS += dist-lzma ++?LZIP?DIST_TARGETS += dist-lzip +?XZ?DIST_TARGETS += dist-xz +?SHAR?DIST_TARGETS += dist-shar +?BZIP2?DIST_TARGETS += dist-bzip2 +?GZIP?DIST_TARGETS += dist-gzip +?ZIP?DIST_TARGETS += dist-zip +?COMPRESS?DIST_TARGETS += dist-tarZ endif %?TOPDIR_P%
