X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fannounce-gen;h=d1a4b255ae9d01fc9f4033bcf135bca36e465ff5;hb=a6608a8874c5af8d43904ee8b06c1c65ea284fa1;hp=c642ef8e1f2ef79d9aaa81f41728c402cbd6ca92;hpb=5145cf1480e738a26de3b44c5679234d26cd6a14;p=gnulib.git

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index c642ef8e1..d1a4b255a 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2008-02-08 10:34'; # UTC
+my $VERSION = '2008-12-02 16:28'; # 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
@@ -92,10 +92,10 @@ The following are optional:
    --news=NEWS_FILE
    --bootstrap-tools=TOOL_LIST  a comma-separated list of tools, e.g.,
                                 autoconf,automake,bison,gnulib
-   --gnulib-snapshot-date=DATE  if gnulib is in the bootstrap tool list,
-                                then report this as the snapshot date.
-                                If not specified, use the current date/time.
-                                If you specify a date here, be sure it is UTC.
+   --gnulib-version=VERSION     report VERSION as the gnulib version, where
+                                VERSION is the result of running git describe
+                                in the gnulib source directory.
+                                required if gnulib is in TOOL_LIST.
 
    --help             display this help and exit
    --version          output version information and exit
@@ -207,7 +207,7 @@ sub print_news_deltas ($$$)
   # the first occurrence of $prev_version.
   my $in_items;
 
-  my $re_prefix = qr/\* (?:Noteworthy|Major) change/;
+  my $re_prefix = qr/(?:\* )?(?:Noteworthy c|Major c|C)(?i:hanges)/;
 
   open NEWS, '<', $news_file
     or die "$ME: $news_file: cannot open for reading: $!\n";
@@ -429,9 +429,13 @@ sub get_tool_versions ($$)
   my $tgz = "$my_distdir.tar.gz";
   my $tbz = "$my_distdir.tar.bz2";
   my $lzma = "$my_distdir.tar.lzma";
+  my $xz = "$my_distdir.tar.xz";
+
   my $xd = "$package_name-$prev_version-$curr_version.xdelta";
 
-  my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma);
+  my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma, $xz);
+  @tarballs
+    or die "$ME: none of $tgz, $tbz, $lzma or $xz were found\n";
   my @sizable = @tarballs;
   -f $xd
     and push @sizable, $xd;
@@ -474,7 +478,7 @@ Then, run a command like this:
 If that command fails because you don't have the required public key,
 then run this command to import it:
 
-  gpg --keyserver wwwkeys.pgp.net --recv-keys $gpg_key_id
+  gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id
 
 and rerun the \`gpg --verify' command.
 EOF