Changeset 544

Timestamp:

09/16/08 02:41:23 (5 years ago)

Author:

bruno

Message:

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

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)
• lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)

devel/pb/bin/pb

@@ -804 +804 @@
             symlink "pbconf/$ddir-$dver-$arch","debian" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
             chmod 0755,"debian/rules";
-            if ($dver !~ /[0-9]/) {
-                # dpkg-deb doesn't accept non digit versions. removing checks
-                # dpkg-source checks upper case when generating perl modules
-            }
+
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
-            $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
+            while (<LOG>) {
+                chomp();
+                my $tmp = $_;
+                next if ($tmp !~ /^dpkg-deb :/);
+                $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
+                $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
+            }
+            close(LOG);
         } elsif ($dtype eq "ebuild") {
             my @ebuildfile;

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -497 +497 @@
             $pbpkgreal = "perl-".$pbpkg;
         } elsif ($dtype eq "deb") {
+            # Only lower case allowed in Debian
+            # Cf: http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Package
             $pbpkgreal = "lib".lc($pbpkg)."-perl";
         } elsif ($dtype eq "ebuild") {

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -108 +108 @@
 }
 
+my @date = pb_get_date();
 # If we don't need to do it, or don't have it fake something
 if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
-    my @date = pb_get_date();
     $date = strftime("%Y-%m-%d", @date);
     $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
@@ -120 +120 @@
         }
     if ($dtype eq "deb") {
+        if ($pbver !~ /^[0-9]/) {
+            # dpkg-deb doesn't accept non digit versions. Prepending date
+            my $ldate = strftime("%Y%m%d", @date);
+            $pbver =~ s/^/$ldate/;
+        }
         print $OUTPUT "$pbrealpkg ($pbver) unstable; urgency=low\n";
         print $OUTPUT "\n";
@@ -171 +176 @@
         }
     if ($dtype eq "deb") {
+        if ($ver !~ /^[0-9]/) {
+            # dpkg-deb doesn't accept non digit versions. Prepending date
+            my $ldate = strftime("%Y%m%d", @date);
+            $ver =~ s/^/$ldate/;
+        }
         print $OUTPUT "$pbrealpkg ($ver) unstable; urgency=low\n";
         print $OUTPUT "\n";