The generated announcement for coreutils-8.14 was adjusted manually to make it more concise, now that there is only one (.xz) tarball. This change to announce-gen makes it generated what I did manually, and in addition (when you set in cfg.mk, url_dir_list = http://ftp.gnu.org/gnu/$(PACKAGE)) it lists both the ftp.gnu.org and ftpmirror.gnu.org addresses automatically, rather than displaying the less-useful http://www.gnu.org/order/ftp.html link.
>From d5af3423d6dc7bc0356c9ff393db6e97305b07bd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyer...@redhat.com> Date: Wed, 9 Nov 2011 22:32:54 +0100 Subject: [PATCH] announce-gen: be more concise when there's only one URL+tarball * build-aux/announce-gen (get_tool_versions): When you distribute only one type of tarball, combine the first two "Here are..." sections and make the key-checking grammar independent of how many tarballs there are. --- ChangeLog | 8 +++++++ build-aux/announce-gen | 52 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e1f6be..79d385c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-11-09 Jim Meyering <meyer...@redhat.com> + + announce-gen: be more concise when there's only one URL+tarball + * build-aux/announce-gen (get_tool_versions): When you distribute + only one type of tarball, combine the first two "Here are..." + sections and make the key-checking grammar independent of + how many tarballs there are. + 2011-11-08 Bruno Haible <br...@clisp.org> More conditional dependencies. diff --git a/build-aux/announce-gen b/build-aux/announce-gen index 0eb6b5b..3866381 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' if 0; # Generate a release announcement message. -my $VERSION = '2011-05-17 20:25'; # UTC +my $VERSION = '2011-11-09 21:30'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -453,28 +453,50 @@ FIXME: put comments here EOF - print_locations ("compressed sources", @url_dir_list, %size, @tarballs); - -f $xd - and print_locations ("xdelta diffs (useful? if so, " - . "please tell bug-gnulib\@gnu.org)", - @url_dir_list, %size, $xd); - my @sig_files = map { "$_.sig" } @tarballs; - print_locations ("GPG detached signatures[*]", @url_dir_list, %size, - @sig_files); + if (@url_dir_list == 1 && @tarballs == 1) + { + # When there's only one tarball and one URL, use a more concise form. + my $m = "$url_dir_list[0]/$tarballs[0]"; + print "Here are the compressed sources and a GPG detached signature[*]:\n" + . " $m\n" + . " $m.sig\n\n"; + } + else + { + print_locations ("compressed sources", @url_dir_list, %size, @tarballs); + -f $xd + and print_locations ("xdelta diffs (useful? if so, " + . "please tell bug-gnulib\@gnu.org)", + @url_dir_list, %size, $xd); + my @sig_files = map { "$_.sig" } @tarballs; + print_locations ("GPG detached signatures[*]", @url_dir_list, %size, + @sig_files); + } + if ($url_dir_list[0] =~ "gnu\.org") { - print "To reduce load on the main server, use a mirror listed at:\n"; - print " http://www.gnu.org/order/ftp.html\n\n"; + print "Use a mirror for higher download bandwidth:\n"; + if (@tarballs == 1 && $url_dir_list[0] =~ m!http://ftp\.gnu\.org/gnu/!) + { + (my $m = "$url_dir_list[0]/$tarballs[0]") + =~ s!http://ftp\.gnu\.org/gnu/!http://ftpmirror\.gnu\.org/!; + print " $m\n" + . " $m.sig\n\n"; + + } + else + { + print " http://www.gnu.org/order/ftp.html\n\n"; + } } $print_checksums_p and print_checksums (@sizable); print <<EOF; -[*] You can use either of the above signature files to verify that -the corresponding file (without the .sig suffix) is intact. First, -be sure to download both the .sig file and the corresponding tarball. -Then, run a command like this: +[*] Use a .sig file to verify that the corresponding file (without the +.sig suffix) is intact. First, be sure to download both the .sig file +and the corresponding tarball. Then, run a command like this: gpg --verify $tarballs[0].sig -- 1.7.8.rc0.61.g8a042