diff options
| -rwxr-xr-x | man/help2man | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/man/help2man b/man/help2man index e3e5040c3..895069e89 100755 --- a/man/help2man +++ b/man/help2man @@ -25,7 +25,7 @@ use Getopt::Long; use POSIX qw(strftime setlocale LC_TIME); my $this_program = 'help2man'; -my $this_version = '1.006'; +my $this_version = '1.007'; my $version_info = <<EOT; $this_program $this_version @@ -151,22 +151,22 @@ if ($opt_output) # # <version> # <program> <version> -# GNU <program> <version> -# <program> (GNU <package>) <version> -# <program> - GNU <package> <version> +# {GNU,Free} <program> <version> +# <program> ({GNU,Free} <package>) <version> +# <program> - {GNU,Free} <package> <version> # # and seperated from any copyright/author details by a blank line. $_ = shift @version; -if (/^(\S+)\s+\((GNU\s+[^)]+)\)\s+(.*)/ or - /^(\S+)\s+-\s*(GNU\s+\S+)\s+(.*)/) +if (/^(\S+)\s+\(((?:GNU|Free)\s+[^)]+)\)\s+(.*)/ or + /^(\S+)\s+-\s*((?:GNU|Free)\s+\S+)\s+(.*)/) { $program = $1; $package = $2; $version = $3; } -elsif (/^(GNU\s+)?(\S+)\s+(.*)/) +elsif (/^((?:GNU|Free)\s+)?(\S+)\s+(.*)/) { $program = $2; $package = $1 ? "$1$2" : $2; @@ -193,7 +193,7 @@ my $PROGRAM = uc $program; # Header. print <<EOT; -.\" DO NOT MODIFY THIS FILE! It was generated by $this_program $this_version. +.\\" DO NOT MODIFY THIS FILE! It was generated by $this_program $this_version. .TH $PROGRAM 1 "$date" "$package $version" "FSF" .SH NAME $include{NAME} |