Changeset 544 in ProjectBuilder for devel/pb/lib

Timestamp:

Sep 16, 2008, 2:41:23 AM (17 years ago)

Author:

Bruno Cornec

Message:

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

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (1 diff)
• Changelog.pm (modified) (3 diffs)

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";