From 7d6b0649427017451841dc69f0be307ba2646076 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 2 Mar 2009 08:49:04 +0100
Subject: [PATCH] announce-gen: new option: --no-print-checksums

* build-aux/announce-gen (usage): Describe it.
(print_checksums): Print a newline here, not in the [*] footnote.
(main): Honor it.
---
 ChangeLog              |  7 +++++++
 build-aux/announce-gen | 14 ++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2dc9bd7a96..e4e8ffdb29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-02  Jim Meyering  <meyering@redhat.com>
+
+	announce-gen: new option: --no-print-checksums
+	* build-aux/announce-gen (usage): Describe it.
+	(print_checksums): Print a newline here, not in the [*] footnote.
+	(main): Honor it.
+
 2009-03-01  Bruno Haible  <bruno@clisp.org>
 
 	Use socklen_t in the native Windows replacements prototypes.
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index d1a4b255ae..f6affabb7b 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.
 
-my $VERSION = '2008-12-02 16:28'; # UTC
+my $VERSION = '2009-03-02 07:45'; # 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
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -96,6 +96,7 @@ The following are optional:
                                 VERSION is the result of running git describe
                                 in the gnulib source directory.
                                 required if gnulib is in TOOL_LIST.
+   --no-print-checksums         do not emit MD5 or SHA1 checksums
 
    --help             display this help and exit
    --version          output version information and exit
@@ -185,8 +186,7 @@ sub print_checksums (@)
 	  print "$dig  $f\n";
 	}
     }
-
-
+  print "\n";
 }
 
 =item C<print_news_deltas ($news_file, $prev_version, $curr_version)
@@ -377,6 +377,7 @@ sub get_tool_versions ($$)
   my @news_file;
   my $bootstrap_tools;
   my $gnulib_version;
+  my $print_checksums_p = 1;
 
   GetOptions
     (
@@ -389,6 +390,7 @@ sub get_tool_versions ($$)
      'news=s'             => \@news_file,
      'bootstrap-tools=s'  => \$bootstrap_tools,
      'gnulib-version=s'   => \$gnulib_version,
+     'print-checksums!'   => \$print_checksums_p,
 
      help => sub { usage 0 },
      version => sub { print "$ME version $VERSION\n"; exit },
@@ -464,10 +466,10 @@ EOF
   print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
 		   @sig_files);
 
-  print_checksums (@sizable);
+  $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.
-- 
2.30.2