[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/scripts
From:       Carsten Wolff <wolff () kde ! org>
Date:       2005-11-29 23:35:06
Message-ID: 1133307306.479714.21972.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 484252 by wolff:

Patch by Peter Eisentraut <peter_e@gmx.net> fixes
2 parsing issues in kdemangen.pl.
1.: recognition of short-only options in --help-all output
2.: parsing of the debian/control file with multiline depends

See also:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337342
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337348


 M  +2 -2      kdemangen.pl  


--- branches/KDE/3.5/kdesdk/scripts/kdemangen.pl #484251:484252
@@ -58,7 +58,7 @@
     my $ret = "";
     foreach( split /\n/, $options )
       {
-	if( /^  (--?[[:alpha:]]+, )?(--[[:alpha:]-]*)( <[[:alpha:] ]*>| [[:alpha:]]*)? *(.*)$/ )
+	if( /^  (--?[[:alpha:]]+, )?(--[[:alpha:]-]*|-[[:alpha:]])( <[[:alpha:] ]*>| [[:alpha:]]*)? *(.*)$/ )
 	  {
 	    my $short;
 	    my $long;
@@ -218,7 +218,7 @@
 my $description = $shortdescription;
 if( -r "control" )
   {
-    $description = `cat control | sed -ne '/Package: $appname\$/,/^\$/p' | egrep -v '^\\w*:.*\$' | sed \
-e 's/^ //' | sed -e 's/^\\.//'`; +    $description = `cat control | sed -ne '/^Description:/,/^\$/p' | \
egrep -v '^\\w*:.*\$' | sed -e 's/^ //' | sed -e 's/^\\.//'`;  # leads to problems in some cases :(
 #    $description =~ s/KDE ?/\n.SM KDE\n/g;
   }


[prev in list] [next in list] [prev in thread] [next in thread]