maint: ship .xz, not .lzma

* configure.ac (AM_INIT_AUTOMAKE): Prefer better file format.
* Makefile.maint (git-release, git-dist, prev-tarball)
(new-tarball, diffs): Use correct extension.
* HACKING: Update instructions.
* .gitignore: Ignore .xz files.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/.gitignore b/.gitignore
index bc7127082ed358e98e24adc1b1833bb58deffdd5..17050be18f65689778d9b51df5f35b448b4ce707 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ libtool
 libtool-*.tar.bz2
 libtool-*.tar.gz
 libtool-*.tar.lzma
+libtool-*.tar.xz
 libtoolize
 libtoolize.in
 manual.html

diff --git a/ChangeLog b/ChangeLog
index 39c3e7a74404d23e2aafc7fd5bf21b2a42419714..543623f50128700dfcb5b6e0c9e2cbfe482af06b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14  Eric Blake  <eblake@redhat.com>
+
+       maint: ship .xz, not .lzma
+       * configure.ac (AM_INIT_AUTOMAKE): Prefer better file format.
+       * Makefile.maint (git-release, git-dist, prev-tarball)
+       (new-tarball, diffs): Use correct extension.
+       * HACKING: Update instructions.
+       * .gitignore: Ignore .xz files.
+
 2010-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        doc: avoid long lines in input and output, indexing fixes.

diff --git a/HACKING b/HACKING
index e9184f2fcdee70443e6de7fa3ac37e81892a0bbf..d36b7f08cbdd1b16d68e886f1dd561d172352a0b 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -602,7 +602,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
   (esp. bug-libtool) for outstanding bug reports also in the list of
   pending moderation requests.
 
-* Make sure you have wget, lzma, and autobuild installed.  aclocal should be
+* Make sure you have wget, xz, and autobuild installed.  aclocal should be
   able to find autobuild.m4; or you can install it into the tree with
          aclocal -I libltdl/m4 --install
 

diff --git a/Makefile.maint b/Makefile.maint
index 784b1558dfa291cc680deda566d7145ffc617a18..e1767139d8c953e0d14a331c5282093b0fd1ee64 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -1,6 +1,6 @@
 ## Makefile.maint -- Makefile rules for libtool maintainers -*-Makefile-*-
 ##
-##   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+##   Copyright (C) 2004, 2005, 2010 Free Software Foundation, Inc.
 ##   Written by Scott James Remnant, 2004
 ##
 ##   This file is part of GNU Libtool.
@@ -39,11 +39,11 @@ TEXI2HTML = texi2html
 .PHONY: git-release
 git-release: version-check prev-tarball check-news fetch git-dist diffs web-manual
        @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \
-       lzmaname="$(PACKAGE)-$(VERSION).tar.lzma"; \
+       xzname="$(PACKAGE)-$(VERSION).tar.xz"; \
        diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
        echo " *** Upload $$tarname, $$tarname.sig,";\
-       echo " *** $$tarname.directive.asc, $$lzmaname,";\
-       echo " *** $$lzmaname.sig, $$lzmaname.directive.asc,";\
+       echo " *** $$tarname.directive.asc, $$xzname,";\
+       echo " *** $$xzname.sig, $$xzname.directive.asc,";\
        echo " *** $$diffname, $$diffname.sig";\
        echo " ***  and $$diffname.directive.asc to either"; \
        echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org."
@@ -134,7 +134,7 @@ git-dist: check-news check-commit
        cd $(srcdir) \
          && $(GIT) tag -s "v$(VERSION)"
 ## Generate signatures and directives for FSF ftp-upload:
-       for suffix in gz lzma; do \
+       for suffix in gz xz; do \
          ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
          $(GPG) --detach-sign $$ofile \
          && echo "version: 1.1" > $$ofile.directive \
@@ -151,7 +151,7 @@ prev-tarball:
                then echo "LASTRELEASE is not set"; exit 1; fi
        @ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \
        if test -f $$ofile; then :; \
-       else ofile="$(PACKAGE)-$(LASTRELEASE).tar.lzma"; \
+       else ofile="$(PACKAGE)-$(LASTRELEASE).tar.xz"; \
           if test -f $$ofile; then :; \
           else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
@@ -160,7 +160,7 @@ new-tarball:
 ## Make sure we have the new release tarball in the tree.
        @ofile="$(PACKAGE)-$(VERSION).tar.gz"; \
        if test -f $$ofile; then :; \
-       else ofile="$(PACKAGE)-$(VERSION).tar.lzma"; \
+       else ofile="$(PACKAGE)-$(VERSION).tar.xz"; \
           if test -f $$ofile; then :; \
           else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
@@ -179,8 +179,8 @@ diffs: prev-tarball new-tarball
        ntar="../$(PACKAGE)-$(VERSION).tar"; \
        test -f "$$otar.gz" && otar="$$otar.gz" && ounpack="gzip"; \
        test -f "$$ntar.gz" && ntar="$$ntar.gz" && nunpack="gzip"; \
-       test -f "$$otar.lzma" && otar="$$otar.lzma" && ounpack="lzma"; \
-       test -f "$$ntar.lzma" && ntar="$$ntar.lzma" && nunpack="zlma"; \
+       test -f "$$otar.xz" && otar="$$otar.xz" && ounpack="xz"; \
+       test -f "$$ntar.xz" && ntar="$$ntar.xz" && nunpack="xz"; \
        $$ounpack -c -d "$$otar" | tar xf - \
        && $$nunpack -c -d "$$ntar" | tar xf - \
        && $(DIFF) $(DIFF_OPTIONS) \

diff --git a/configure.ac b/configure.ac
index d36addeb05e46eb0a2caa40a53e82b3efd7e791b..0fcf109899a7f6e82496fd15da7438c8e24f485b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ AC_SUBST([package_revision])
 dnl These are bootstrap requirements! Once built, libtool may work with
 dnl much older releases of autoconf and automake.  See release notes.
 dnl 1.11 is needed for color-tests, 1.11.1 fixes a security issue.
-AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-lzma color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-xz color-tests parallel-tests])
 
 
 ## ------------------------- ##