[pkg-bioc] svn commit r361 r361 - /trunk/tools-ng/pkgbioc.pm

[psychedelys-guest at users.alioth.debian.org]

Author: psychedelys-guest
Date: Tue Nov 13 11:14:14 2007
New Revision: 361

URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=361
Log:
oops, merge back some forgotten change of pkgbioc.pm in the trunk.

Modified:
    trunk/tools-ng/pkgbioc.pm

Modified: trunk/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=361&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Tue Nov 13 11:14:14 2007
@@ -341,7 +341,7 @@ sub populate_description($$$$$$) {
     print "populate description $repo\n" if $main::verbose;
     my @ary = glob( "../" . $directory . "/$sources/*.tar.gz" );
     print "Found " . ( $#ary + 1 ) . " patterns in the repository $repo.\n"
-      if $main::debug;
+      if $main::verbose;
     foreach my $cur (@ary) {
         next unless defined($cur);
         my $bfile = basename($cur);
@@ -781,36 +781,6 @@ sub Clean_License ($) {
     return $line;
 }
 
-sub Clean_Imports ($) {
-    my ($line) = @_;
-    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
-    $line =~ s/  //go;            # nuke spaces
-    return $line;
-}
-
-sub Clean_Suggests ($) {
-    my ($line) = @_;
-    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
-    $line =~ s/  //go;            # nuke spaces
-    return $line;
-}
-
-sub Clean_SystemRequirements ($) {
-    my ($line) = @_;
-    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
-    $line =~ s/  //go;            # nuke spaces
-    return $line;
-}
-
-sub Clean_Recommends ($) {
-    my ($line) = @_;
-    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
-    $line =~ s/  //go;            # nuke spaces
-    return $line;
-}
-
-
-
 sub DetermineLicenseProblem ($$$$) {
     my ( $package, $license, $packagehashref, $global ) = @_;
     my $section = "main";
@@ -869,6 +839,34 @@ sub Clean_Version ($) {
     return $line;
 }
 
+sub Clean_Suggests ($) {
+    my ($line) = @_;
+    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
+    $line =~ s/ //go;             # nuke spaces
+    return $line;
+}
+
+sub Clean_Imports ($) {
+    my ($line) = @_;
+    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
+    $line =~ s/ //go;             # nuke spaces
+    return $line;
+}
+
+sub Clean_Recommends ($) {
+    my ($line) = @_;
+    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
+    $line =~ s/ //go;             # nuke spaces
+    return $line;
+}
+
+sub Clean_SystemRequirements ($) {
+    my ($line) = @_;
+    $line =~ s/[\r\n\t]/ /mgo;    # nuke new line
+    $line =~ s/ //go;             # nuke spaces
+    return $line;
+}
+
 # loading description from a package already loaded in memory, but from an other mirror
 # the Bioc packages have a better dependencies and a tagging already in.
 sub loadAlternativeDescriptionsForPackage ($$$$$$$) {
@@ -892,7 +890,9 @@ sub loadAlternativeDescriptionsForPackag
         'BundleDescription', 'Title',
         'Contains',          'Depends',
         'Package',           'URL',
-        'Date',              'biocViews'
+        'Date',               'biocViews',
+        'Suggests',           'Imports',
+        'SystemRequirements', 'Recommends'
       )
     {
         if ( exists( $rdcf->{$field} ) and defined( $rdcf->{$field} ) ) {