Update generated upload directive file format to v1.1.

* Makefile.maint (git-dist, diffs): Update to generate v1.1 format
directive files for ftp://ftp-upload.gnu.org/incoming/ftp.

diff --git a/ChangeLog b/ChangeLog
index ad9eb4012ba23ba8c5e918b43205fe9b7ea472c0..7a0472c9d5d059c0c8fb4da22ee66396b5a4c407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+       Update generated upload directive file format to v1.1.
+       * Makefile.maint (git-dist, diffs): Update to generate v1.1 format
+       directive files for ftp://ftp-upload.gnu.org/incoming/ftp.
+
        Fix web manual generation details in release instructions.
        * HACKING (Release Procedure): Move the instruction for generating
        web manuals for a new release to before the instruction that bumps

diff --git a/Makefile.maint b/Makefile.maint
index 70b740517c5034886b00dabecb1ec2828db1d3b3..70d881049d5589e32d5cd23c5d50629062ad5b92 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -177,7 +177,9 @@ git-dist: check-news check-commit
        for suffix in gz lzma; do \
          ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
          $(GPG) --detach-sign $$ofile \
-         && echo "directory: libtool" > $$ofile.directive \
+         && echo "version: 1.1" > $$ofile.directive \
+         && echo "directory: libtool" >> $$ofile.directive \
+         && echo "filename: $$ofile" >> $$ofile.directive \
          && $(GPG) --clearsign $$ofile.directive \
          && rm -f $$ofile.directive; \
        done
@@ -225,7 +227,9 @@ diffs: prev-tarball new-tarball
                $(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \
                | GZIP=$(GZIP_ENV) gzip -c > $$ofile \
        && $(GPG) --detach-sign $$ofile \
-       && echo "directory: libtool" > $$ofile.directive \
+       && echo "version: 1.1" > $$ofile.directive \
+       && echo "directory: libtool" >> $$ofile.directive \
+       && echo "filename: $$ofile" |sed 's,: \.\./,: ,' >> $$ofile.directive \
        && $(GPG) --clearsign $$ofile.directive \
        && rm -f $$ofile.directive