[SCM] GNU Libtool branch, master, updated. v2.2.4-50-g35bd5f3

[Gary V. Vaughan]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  35bd5f31765013e9e3f22a10874b2014cebc428e (commit)
      from  7260eb4241f6c6f7e560a04869d10084de39e0fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 35bd5f31765013e9e3f22a10874b2014cebc428e
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 7 16:17:37 2008 +0800

    Enable release procedure to work with lzma OLDRELEASE file.
    * Makefile.maint (diffs, prev-tarball, new-tarball): If lzma
    tarballs are present use them to generate the diffs, otherwise
    use gz tarballs if they are present, or else complain if both
    are missing.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    6 ++++++
 Makefile.maint |   22 ++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23d9026..07b5074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-07  Gary V. Vaughan  <address@hidden>
 
+       Enable release procedure to work with lzma OLDRELEASE file.
+       * Makefile.maint (diffs, prev-tarball, new-tarball): If lzma
+       tarballs are present use them to generate the diffs, otherwise
+       use gz tarballs if they are present, or else complain if both
+       are missing.
+
        Set SCM version number to 2.2.7a.
        * configure.ac, libltdl/configure.ac (AC_INIT): Bump version
        number to 2.2.7a.
diff --git a/Makefile.maint b/Makefile.maint
index 64f1757..02284df 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -175,28 +175,38 @@ prev-tarball:
                then echo "LASTRELEASE is not set"; exit 1; fi
        @ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \
        if test -f $$ofile; then :; \
-       else echo "Cannot make diffs without $$ofile"; exit 1; fi
+       else ofile="$(PACKAGE)-$(LASTRELEASE).tar.lzma"; \
+          if test -f $$ofile; then :; \
+          else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
 .PHONY: new-tarball
 new-tarball:
 ## Make sure we have the new release tarball in the tree.
        @ofile="$(PACKAGE)-$(VERSION).tar.gz"; \
        if test -f $$ofile; then :; \
-       else echo "Cannot make diffs without $$ofile"; exit 1; fi
+       else ofile="$(PACKAGE)-$(VERSION).tar.lzma"; \
+          if test -f $$ofile; then :; \
+          else echo "Cannot make diffs without $$ofile"; exit 1; fi; fi
 
 DIFF = diff
 DIFF_OPTIONS = -ruNp
 
-.PHONY: diff
+.PHONY: diffs
 diffs: prev-tarball new-tarball
 ## Unpack the tarballs somewhere to diff them
        rm -rf delta-diff
        mkdir delta-diff
 
+       cd delta-diff; \
        ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
-       cd delta-diff \
-       && tar xzf "../$(PACKAGE)-$(LASTRELEASE).tar.gz" \
-       && tar xzf "../$(PACKAGE)-$(VERSION).tar.gz" \
+       otar="../$(PACKAGE)-$(LASTRELEASE).tar"; \
+       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"; \
+       $$ounpack -c -d "$$otar" | tar xf - \
+       && $$nunpack -c -d "$$ntar" | tar xf - \
        && $(DIFF) $(DIFF_OPTIONS) \
                $(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \
                | GZIP=$(GZIP_ENV) gzip -c > $$ofile \


hooks/post-receive
--
GNU Libtool