diff options
author | Karl Berry <karl@freefriends.org> | 2021-08-07 17:59:40 -0700 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-08-07 17:59:40 -0700 |
commit | b2487b787f9787a2867d0a578888b0c056ec1453 (patch) | |
tree | eab4e996c0b7d57a16d93372fc855f2bb5b17425 | |
parent | 522e0d4088f61580a7f34f5e65620fb914f17947 (diff) | |
download | automake-b2487b787f9787a2867d0a578888b0c056ec1453.tar.gz |
maint: Update doc/help2man.
* doc/help2man: update to 1.48.2.
-rwxr-xr-x | doc/help2man | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/doc/help2man b/doc/help2man index db8bedf3f..c795357e0 100755 --- a/doc/help2man +++ b/doc/help2man @@ -1,7 +1,9 @@ #!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, +# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 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 @@ -14,10 +16,10 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, see <https://www.gnu.org/licenses/>. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # Written by Brendan O'Dea <bod@debian.org> -# Available from https://ftp.gnu.org/gnu/help2man/ +# Available from ftp://ftp.gnu.org/gnu/help2man/ use 5.008; use strict; @@ -27,7 +29,7 @@ use Text::Tabs qw(expand); use POSIX qw(strftime setlocale LC_ALL); my $this_program = 'help2man'; -my $this_version = '1.47.4'; +my $this_version = '1.48.2'; sub _ { $_[0] } sub configure_locale @@ -51,8 +53,9 @@ sub fix_italic_spacing; my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version; GNU %s %s -Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, -2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, +2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 Free Software +Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -247,15 +250,15 @@ my $help_text = get_option_value $ARGV[0], $help_option; $version_text ||= get_option_value $ARGV[0], $version_option; # By default the generated manual pages will include the current date. This may -# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH -# to an integer value of the seconds since the UNIX epoch. This is primarily +# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH to +# an integer value of the seconds since the UNIX epoch. This is primarily # intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds) # and will additionally ensure that the output date string is UTC. my $epoch_secs = time; if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) { $epoch_secs = $1; - $ENV{TZ} = 'UTC'; + $ENV{TZ} = 'UTC0'; } # Translators: the following message is a strftime(3) format string, which in @@ -282,21 +285,23 @@ if ($opt_output) # <version> # <program> <version> # {GNU,Free} <program> <version> -# <program> ({GNU,Free} <package>) <version> -# <program> - {GNU,Free} <package> <version> +# <program> ({GNU,Free,} <package>) <version> +# <program> - {GNU,Free,} <package> <version> +# <program> - {GNU,Free,} <package> - <version> # # and separated from any copyright/author details by a blank line. ($_, $version_text) = ((split /\n+/, $version_text, 2), ''); -if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or - /^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/) +if (/^(\S+) +\(((?:(?:GNU|Free) +)?[^)]+)\) +(\S.*)$/ or + /^(\S+) +- +((?:(?:GNU|Free) +)?\S.*) +- +(\S.*)$/ or + /^(\S+) +- +((?:(?:GNU|Free) +)?\S+) +(\S.*)$/) { $program = program_basename $1; $package = $2; $version = $3; } -elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/) +elsif (/^((?:GNU|Free) +)?(\S+) +(\S.*)$/) { $program = program_basename $2; $package = $1 ? "$1$program" : $program; @@ -336,7 +341,7 @@ for ($replace{_('NAME')} || ($include{_('NAME')} ||= '')) my $PROGRAM = uc $program; # Set default page head/footers -$source ||= "$program $version"; +$source ||= "$package $version"; unless ($manual) { for ($section) @@ -758,7 +763,7 @@ sub convert_option } # Insert spacing escape characters \, and \/ before and after italic text. See -# https://www.gnu.org/software/groff/manual/html_node/Ligatures-and-Kerning.html +# http://www.gnu.org/software/groff/manual/html_node/Ligatures-and-Kerning.html sub fix_italic_spacing { local $_ = shift; |