Changeset 544


Ignore:
Timestamp:
Sep 16, 2008, 2:41:23 AM (12 years ago)
Author:
Bruno Cornec
Message:

Still improving debian handling. Final delivery and $made still not completely correct

Location:
devel/pb
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r541 r544  
    804804            symlink "pbconf/$ddir-$dver-$arch","debian" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
    805805            chmod 0755,"debian/rules";
    806             if ($dver !~ /[0-9]/) {
    807                 # dpkg-deb doesn't accept non digit versions. removing checks
    808                 # dpkg-source checks upper case when generating perl modules
    809             }
     806
    810807            pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
    811             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
     808            # Get the name of the generated packages
     809            open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
     810            while (<LOG>) {
     811                chomp();
     812                my $tmp = $_;
     813                next if ($tmp !~ /^dpkg-deb :/);
     814                $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
     815                $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
     816            }
     817            close(LOG);
    812818        } elsif ($dtype eq "ebuild") {
    813819            my @ebuildfile;
  • devel/pb/lib/ProjectBuilder/CMS.pm

    r539 r544  
    497497            $pbpkgreal = "perl-".$pbpkg;
    498498        } elsif ($dtype eq "deb") {
     499            # Only lower case allowed in Debian
     500            # Cf: http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Package
    499501            $pbpkgreal = "lib".lc($pbpkg)."-perl";
    500502        } elsif ($dtype eq "ebuild") {
  • devel/pb/lib/ProjectBuilder/Changelog.pm

    r543 r544  
    108108}
    109109
     110my @date = pb_get_date();
    110111# If we don't need to do it, or don't have it fake something
    111112if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
    112     my @date = pb_get_date();
    113113    $date = strftime("%Y-%m-%d", @date);
    114114    $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
     
    120120        }
    121121    if ($dtype eq "deb") {
     122        if ($pbver !~ /^[0-9]/) {
     123            # dpkg-deb doesn't accept non digit versions. Prepending date
     124            my $ldate = strftime("%Y%m%d", @date);
     125            $pbver =~ s/^/$ldate/;
     126        }
    122127        print $OUTPUT "$pbrealpkg ($pbver) unstable; urgency=low\n";
    123128        print $OUTPUT "\n";
     
    171176        }
    172177    if ($dtype eq "deb") {
     178        if ($ver !~ /^[0-9]/) {
     179            # dpkg-deb doesn't accept non digit versions. Prepending date
     180            my $ldate = strftime("%Y%m%d", @date);
     181            $ver =~ s/^/$ldate/;
     182        }
    173183        print $OUTPUT "$pbrealpkg ($ver) unstable; urgency=low\n";
    174184        print $OUTPUT "\n";
Note: See TracChangeset for help on using the changeset viewer.