diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | help2man.PL | 18 | ||||
| -rw-r--r-- | help2man.h2m | 2 | ||||
| -rw-r--r-- | help2man.texi | 4 |
6 files changed, 31 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Version 1.38 March 14, 2010 + + * Support ENVIRONMENT and FILES sections. + Version 1.37 November 14, 2009 * Update GPL to v3. @@ -26,6 +26,7 @@ Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de> suzukis <suzukis@cmpt.phys.tohoku.ac.jp> Reuben Thomas <rrt@sc3d.org> Patrick Tullmann <tullmann@cs.utah.edu> +Sven Utcke <sven.utcke@gmx.de> Tommi Vainikainen <thv+debian@iki.fi> Christopher Yeoh <cyeoh@users.sourceforge.net> Okuji Yoshinori <okuji@kuicr.kyoto-u.ac.jp> diff --git a/debian/changelog b/debian/changelog index b5f63c0..b51f526 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +help2man (1.38.1) unstable; urgency=low + + * Add support for ENVIRONMENT and FILES sections (Sven Utcke). + + -- Brendan O'Dea <bod@debian.org> Sun, 14 Mar 2010 15:19:51 +1100 + help2man (1.37.1) unstable; urgency=low * Fix typo in comment (Paul Eggert). diff --git a/help2man.PL b/help2man.PL index dbf5aee..1c4e016 100755 --- a/help2man.PL +++ b/help2man.PL @@ -58,7 +58,7 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}' print OUT <<'!NO!SUBS!'; # Generate a short man page from --help and --version output. -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -154,7 +154,7 @@ sub N_ { $_[0] } 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 +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010 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. @@ -467,6 +467,8 @@ s/\\/\x82/g; my $PAT_BUGS = _('Report +(?:[\w-]* +)?bugs|Email +bug +reports +to'); my $PAT_AUTHOR = _('Written +by'); my $PAT_OPTIONS = _('Options'); +my $PAT_ENVIRONMENT = _('Environment'); +my $PAT_FILES = _('Files'); my $PAT_EXAMPLES = _('Examples'); my $PAT_FREE_SOFTWARE = _('This +is +free +software'); @@ -487,6 +489,16 @@ while (length) $sect = _('OPTIONS'); next; } + if (s/^($PAT_ENVIRONMENT): *\n//o) + { + $sect = _('ENVIRONMENT'); + next; + } + if (s/^($PAT_FILES): *\n//o) + { + $sect = _('FILES'); + next; + } elsif (s/^($PAT_EXAMPLES): *\n//o) { $sect = _('EXAMPLES'); @@ -674,7 +686,7 @@ EOT # Section ordering. my @pre = (_('NAME'), _('SYNOPSIS'), _('DESCRIPTION'), _('OPTIONS'), - _('EXAMPLES')); + _('ENVIRONMENT'), _('FILES'), _('EXAMPLES')); my @post = (_('AUTHOR'), _('REPORTING BUGS'), _('COPYRIGHT'), _('SEE ALSO')); my $filter = join '|', @pre, @post; diff --git a/help2man.h2m b/help2man.h2m index 86a228f..0e07c9e 100644 --- a/help2man.h2m +++ b/help2man.h2m @@ -43,6 +43,8 @@ The section output order (for those included) is: SYNOPSIS DESCRIPTION OPTIONS + ENVIRONMENT + FILES EXAMPLES \fIother\fR AUTHOR diff --git a/help2man.texi b/help2man.texi index 1d06988..d0aa7c3 100644 --- a/help2man.texi +++ b/help2man.texi @@ -14,7 +14,7 @@ This file documents the GNU @command{help2man} command which produces simple manual pages from the @samp{--help} and @samp{--version} output of other commands. -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -321,6 +321,8 @@ NAME SYNOPSIS DESCRIPTION OPTIONS +ENVIRONMENT +FILES EXAMPLES @emph{other} AUTHOR |