Changeset 543 in ProjectBuilder

Timestamp:

Sep 16, 2008, 1:50:58 AM (16 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:

• Changelog.pm (modified) (5 diffs)
• Filter.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -63 +63 @@
 sub pb_changelog {
 
-my $dtype = shift;
-my $pkg = shift;
-my $pbver = shift;
-my $pbtag = shift;
-my $dsuf = shift;
+my $pb = shift;
+my $dtype = $pb->{'dtype'};
+my $pbrealpkg = $pb->{'realpkg'};
+my $pbver = $pb->{'ver'};
+my $pbtag = $pb->{'tag'};
+my $dsuf = $pb->{'suf'};
 my $path = shift;
 my $OUTPUT = shift;
 my $doit = shift;
-my $chglog = shift || undef;
+my $chglog = $pb->{'chglog'} || undef;
 
 my $log = "";
@@ -79 +80 @@
 
 if ((not (defined $dtype)) || ($dtype eq "") || 
-        (not (defined $pkg)) || ($pkg eq "") || 
+        (not (defined $pbrealpkg)) || ($pbrealpkg eq "") || 
         (not (defined $pbver)) || ($pbver eq "") || 
         (not (defined $pbtag)) || ($pbtag eq "") || 
@@ -91 +92 @@
 
 if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
-    #pb_log(2,"No ChangeLog file ($chglog) for $pkg\n";
+    #pb_log(2,"No ChangeLog file ($chglog) for $pbrealpkg\n";
     print $OUTPUT "\n";
     return;
@@ -119 +120 @@
         }
     if ($dtype eq "deb") {
-        print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n";
+        print $OUTPUT "$pbrealpkg ($pbver) unstable; urgency=low\n";
         print $OUTPUT "\n";
         print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
@@ -170 +171 @@
         }
     if ($dtype eq "deb") {
-        print $OUTPUT "$pkg ($ver) unstable; urgency=low\n";
+        print $OUTPUT "$pbrealpkg ($ver) unstable; urgency=low\n";
         print $OUTPUT "\n";
         }

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -162 +162 @@
             my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
             $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
-            pb_changelog($pb->{'dtype'}, $pb->{'pkg'}, $pb->{'ver'}, $pb->{'tag'}, $pb->{'suf'}, $p, \*DEST, $tmp, $pb->{'chglog'});
+            pb_changelog($pb, $p, \*DEST, $tmp);
             $tmp = "";
         } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {