Changeset 51 for trunk


Ignore:
Timestamp:
03/09/06 14:57:57 (19 years ago)
Author:
kdeugau
Message:

/trunk

Add Conflicts: support on main package.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r50 r51  
    575575      } elsif (/^provides:\s+(.+)/i) {
    576576        $pkgdata{main}{provides} .= ", $1";
     577      } elsif (/^conflicts:\s+(.+)/i) {
     578        $pkgdata{main}{conflicts} .= ", $1";
    577579      }
    578580#Name: suwrap
     
    715717      $pkgdata{$pkg}{provides} = expandmacros($pkgdata{$pkg}{provides},'gp');
    716718    }
     719    if (defined($pkgdata{$pkg}{conflicts})) {
     720      $pkgdata{$pkg}{conflicts} =~ s/^, //;
     721      $pkgdata{$pkg}{conflicts} = expandmacros($pkgdata{$pkg}{conflicts},'gp');
     722    }
    717723
    718724    # Gotta do this next, otherwise the control file has nowhere to go.  >:(
     
    741747        ( $pkgdata{$pkg}{requires} ne '' ? "Depends: $pkgdata{$pkg}{requires}\n" : '' ).
    742748        ( defined($pkgdata{$pkg}{provides}) ? "Provides: $pkgdata{$pkg}{provides}\n" : '' ).
     749        ( defined($pkgdata{$pkg}{conflicts}) ? "Conflicts: $pkgdata{$pkg}{conflicts}\n" : '' ).
    743750        "Description: $pkgdata{$pkg}{summary}\n";
    744751    $control .= "$pkgdata{$pkg}{desc}\n";
Note: See TracChangeset for help on using the changeset viewer.