Changeset 543


Ignore:
Timestamp:
Sep 16, 2008, 1:50:58 AM (12 years ago)
Author:
Bruno Cornec
Message:

Working debian packages for virtual/real packages such as for perl modules (pb itself)

Location:
devel/pb/lib/ProjectBuilder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Changelog.pm

    r473 r543  
    6363sub pb_changelog {
    6464
    65 my $dtype = shift;
    66 my $pkg = shift;
    67 my $pbver = shift;
    68 my $pbtag = shift;
    69 my $dsuf = shift;
     65my $pb = shift;
     66my $dtype = $pb->{'dtype'};
     67my $pbrealpkg = $pb->{'realpkg'};
     68my $pbver = $pb->{'ver'};
     69my $pbtag = $pb->{'tag'};
     70my $dsuf = $pb->{'suf'};
    7071my $path = shift;
    7172my $OUTPUT = shift;
    7273my $doit = shift;
    73 my $chglog = shift || undef;
     74my $chglog = $pb->{'chglog'} || undef;
    7475
    7576my $log = "";
     
    7980
    8081if ((not (defined $dtype)) || ($dtype eq "") ||
    81         (not (defined $pkg)) || ($pkg eq "") ||
     82        (not (defined $pbrealpkg)) || ($pbrealpkg eq "") ||
    8283        (not (defined $pbver)) || ($pbver eq "") ||
    8384        (not (defined $pbtag)) || ($pbtag eq "") ||
     
    9192
    9293if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
    93     #pb_log(2,"No ChangeLog file ($chglog) for $pkg\n";
     94    #pb_log(2,"No ChangeLog file ($chglog) for $pbrealpkg\n";
    9495    print $OUTPUT "\n";
    9596    return;
     
    119120        }
    120121    if ($dtype eq "deb") {
    121         print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n";
     122        print $OUTPUT "$pbrealpkg ($pbver) unstable; urgency=low\n";
    122123        print $OUTPUT "\n";
    123124        print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
     
    170171        }
    171172    if ($dtype eq "deb") {
    172         print $OUTPUT "$pkg ($ver) unstable; urgency=low\n";
     173        print $OUTPUT "$pbrealpkg ($ver) unstable; urgency=low\n";
    173174        print $OUTPUT "\n";
    174175        }
  • devel/pb/lib/ProjectBuilder/Filter.pm

    r500 r543  
    162162            my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
    163163            $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
    164             pb_changelog($pb->{'dtype'}, $pb->{'pkg'}, $pb->{'ver'}, $pb->{'tag'}, $pb->{'suf'}, $p, \*DEST, $tmp, $pb->{'chglog'});
     164            pb_changelog($pb, $p, \*DEST, $tmp);
    165165            $tmp = "";
    166166        } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
Note: See TracChangeset for help on using the changeset viewer.