Fix bugs reported by Dominique

Author: cyeoh

lsb_release/src/Makefile

@@ -10,12 +10,8 @@ all: man
 man: lsb_release.1.gz
 
 lsb_release.1.gz: lsb_release
-	@cp -p lsb_release lsb_release.orig
-	@cat lsb_release.orig | sed -e "s/\[ -n \"\$ARG_V\" \] \&\& DisplayVersion/\[ -n \"\$ARG_V\" \] \&\& Version/" >./lsb_release
-	@chmod a+x ./lsb_release
-	@./help2man -N --include ./lsb_release.examples ./lsb_release >lsb_release.1
-	@mv lsb_release.orig lsb_release
-	@gzip -f lsb_release.1
+	@./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1
+#	@gzip -f lsb_release.1
 
 install: all
 	install -D -m 644 lsb_release.1.gz ${prefix}/man/man1/lsb_release.1.gz

lsb_release/src/doman

@@ -20,6 +20,9 @@
 # Written by Brendan O'Dea <bod@compusol.com.au>
 # Available from ftp://ftp.gnu.org/gnu/help2man/
 
+# This has been modified by Chris Yeoh <cyeoh@linuxcare.com.au> to
+# handle non 
+
 use 5.004;
 use strict;
 use Getopt::Long;
@@ -43,14 +46,15 @@ my $help_info = <<EOT;
 
 Usage: $this_program [OPTION]... EXECUTABLE
 
- -n, --name=STRING       use `STRING' as the description for the NAME paragraph
- -s, --section=SECTION   use `SECTION' as the section for the man page
- -i, --include=FILE      include material from `FILE'
- -I, --opt-include=FILE  include material from `FILE' if it exists
- -o, --output=FILE       send output to `FILE'
- -N, --no-info           suppress pointer to Texinfo manual
-     --help              print this help, then exit
-     --version           print version number, then exit
+ -n, --name=STRING         use `STRING' as the description for the NAME paragraph
+ -s, --section=SECTION     use `SECTION' as the section for the man page
+ -i, --include=FILE        include material from `FILE'
+ -I, --opt-include=FILE    include material from `FILE' if it exists
+ -o, --output=FILE         send output to `FILE'
+ -N, --no-info             suppress pointer to Texinfo manual
+     --alt_version_key=KEY use specified flag instead of --version
+     --help                print this help, then exit
+     --version             print version number, then exit
 
 EXECUTABLE should accept `--help' and `--version' options.
 
@@ -59,6 +63,7 @@ EOT
 
 my $section = 1;
 my ($opt_name, @opt_include, $opt_output, $opt_no_info);
+my($opt_version_key) = "version";
 
 # Parse options.
 Getopt::Long::config('bundling');
@@ -69,6 +74,7 @@ GetOptions (
     'I|opt-include=s'	=> sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	=> \$opt_output,
     'N|no-info'		=> \$opt_no_info,
+    'alt_version_key=s' => \$opt_version_key,
     help		=> sub { print $help_info; exit },
     version		=> sub { print $version_info; exit },
 ) or die $help_info;
@@ -164,7 +170,7 @@ setlocale LC_TIME, 'C';
 my ($help_text, $version_text) = map {
     join '', map { s/ +$//; expand $_ } `$ARGV[0] --$_ 2>/dev/null`
 	or die "$this_program: can't get `--$_' info from $ARGV[0]\n"
-} qw(help version);
+} qw(help), $opt_version_key;
 
 my $date = strftime "%B %Y", localtime;
 (my $program = $ARGV[0]) =~ s!.*/!!;
@@ -467,11 +473,11 @@ EOT
 # Output header.
 print <<EOT;
 .\\" DO NOT MODIFY THIS FILE!  It was generated by $this_program $this_version.
-.TH $PROGRAM "$section" "$date" "$package $version" FSF
+.TH $PROGRAM "$section" "$date" "$package $version" FSG
 EOT
 
 # Section ordering.
-my @pre = qw(NAME SYNOPSIS DESCRIPTION OPTIONS EXAMPLES);
+my @pre = qw(NAME SYNOPSIS DESCRIPTION OPTIONS FILES EXAMPLES);
 my @post = ('AUTHOR', 'REPORTING BUGS', 'COPYRIGHT', 'SEE ALSO');
 my $filter = join '|', @pre, @post;
 

lsb_release/src/help2man

@@ -62,6 +62,18 @@ DESCSTR_DELI="release"
 #     FUNCTIONS
 ###############################################################################
 
+function DisplayProgramVersion() { 
+    echo "GNU ${0##*/} $SCRIPTVERSION"
+    echo
+    echo "Copyright (C) 2000 Free Software Group, Inc."
+    echo "This is free software; see the source for copying conditions.  There\
+ is NO"
+    echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR\
+ PURPOSE."
+    echo
+    echo "Written by Dominique MASSONIE."
+}
+
 # defines the Usage for lsb_release
 Usage() {
     echo "LSB `basename $0` $SCRIPTVERSION print certain LSB (Linux\
@@ -97,14 +109,14 @@ EnhancedGetopt() {
     getopt -T >/dev/null 2>&1             # is getopt the enhanced one ?
     if [ $? = 4 ]
     then                                  # Yes, advanced args ALLOWED
-        OPT=$(getopt -o acdhirsv                                              \
-              --long all,codename,description,help,id,release,short,version   \
+        OPT=$(getopt -o acdhirsvp                                             \
+              --long all,codename,description,help,id,release,short,version,program_version   \
               -n 'lsb_release'                                                \
               -- "$@")
     else                                  # No, advanced args NOT allowed
         # convert (if needed) the enhanced options into basic ones
         MYARGS=$(echo "$@" | sed -e "/--/s/-\(-[[:alnum:]]\)[[:alnum:]]*/\1/g")
-        OPT=$(getopt -o acdhirsv                                              \
+        OPT=$(getopt -o acdhirsvp                                             \
                      -n 'lsb_release'                                         \
                      -- "$MYARGS")
     fi
@@ -122,7 +134,8 @@ EnhancedGetopt() {
         -r|--release) ARG_R="y"; shift;;
         -s|--short) ARG_S="y"; shift;;
         -v|--version) ARG_V="y"; shift;;
-        -h|--help) Usage;;
+        -p|--program_version) ARG_P="y"; shift;;
+	-h|--help) Usage;;
         --) shift; break;;
         *)  EXIT_STATUS=$ERROR_USER
             Usage;;
@@ -360,6 +373,7 @@ GetLSBInfo
 GetDistribInfo
 
 # Display requested infos (order as follow)
+[ -n "$ARG_P" ] && DisplayProgramVersion
 [ -n "$ARG_V" ] && DisplayVersion
 [ -n "$ARG_I" ] && DisplayID
 [ -n "$ARG_D" ] && DisplayDescription

lsb_release/src/lsb_release

@@ -1,7 +1,7 @@
 [FILES]
 The \fB"/etc/lsb-release"\fR file should contain the following fields:
 
-\fBLSB_VERSION="1.0"\fR (REQUIRED)
+\fBLSB_VERSION="\fR1.0\fB"\fR (REQUIRED)
 
 And some optional fields like 
 \fBDISTRIB_ID\fR, \fBDISTRIB_RELEASE\fR, \fBDISTRIB_CODENAME\fR, \fBDISTRIB_DESCRIPTION\fR
@@ -20,7 +20,7 @@ Where \fIDistributor\fR can be a couple of words, but then concatenated (i.e. Li
 
 And \fBrelease\fR is a keyword not to be used in \fBDISTRIB_DESCRIPTION\fR if you don't want to overwrite "/etc/[distrib]-release" data.
 
-\fBNotice:\fR To support the \fBDebian\fR distributions' lak of information (see "/etc/debian_version" file) some have been directly added into the \fBlsb_release\fR script.
+\fBNotice:\fR To support the \fBDebian\fR distributions' lack of information (see "/etc/debian_version" file) some have been directly added into the \fBlsb_release\fR script.
 
 [EXAMPLES]
 .B The "/etc/lsb-release" file contains:
@@ -65,4 +65,4 @@ Codename:       TryIt
 
 [REPORTING BUGS]
 Report bugs to <mdomi@users.sourceforge.net>.
-Include a complete, selfcontained example that will allow the bug to be reproduced, and say which version of lsb_release you are using.
+Include a complete, self contained example that will allow the bug to be reproduced, and say which version of lsb_release you are using.