[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/2.9.5-2-81-g4708404

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 4708404312b82ce3546fbb74599c7812970c7ed2
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Mon Mar 16 11:49:02 2009 +0100

    More clear regexpr

diff --git a/debian/xml-man/generate-man b/debian/xml-man/generate-man
index eac6ebb..52b8f48 100644
--- a/debian/xml-man/generate-man
+++ b/debian/xml-man/generate-man
@@ -29,7 +29,7 @@ open (XML , "< $command.tpl.xml") || die("Cannot find $command.tpl.xml\n");
 open (NEW , "> $command.xml");
 
 sub clean() {
-    local $expr = $_[0];
+    my $expr = shift;
     $expr =~ s/</&lt;/g;
     $expr =~ s/>/&gt;/g;
     $expr =~ s/\n//g;
@@ -37,8 +37,8 @@ sub clean() {
 }
 
 sub print_item() {
-    local $opt = $_[0];
-    local $des = $_[1];
+    my $opt = shift;
+    my $des = shift;
     if ($opt ne "") {
 	$opt =~ s/</&lt;/g;
 	$opt =~ s/>/&gt;/g;
@@ -53,14 +53,16 @@ sub print_item() {
 while (<XML>) {
     if (/\@GENERATE_MAN\@/) {
 	while (<HELP>) {
-	    if (/^  (-[^:]*[a-zA-Z\>\"])[:[ 	]+(.*)[ ]*\n]?/) {
+	    if (/^  (-[^:]*[a-zA-Z>"])([ ]*:[ \t]+(.*)[ ]*$)?/) {
 		&print_item($option, $desc);
 		$option = "$1";
 		$desc = "";
-		if ($2 =~ /private/) {
-		    $desc .= "\t\t\t<para>The RSA private key of this client</para>\n";
-		} elsif ($2 ne "") {
-		    $desc .= "\t\t\t<para>".&clean($2)."</para>\n";
+		if (defined $2) {
+		    if ($3 =~ /private key/) {
+			$desc .= "\t\t\t<para>The RSA private key of this client</para>\n";
+		    } elsif ($3 ne "") {
+			$desc .= "\t\t\t<para>".&clean($3)."</para>\n";
+		    }
 		}
 	    } elsif (/([^ ].*)\n/) {
 		$desc .= "\t\t\t<para>".&clean($1)."</para>\n";

-- 
mldonkey packaging