Changeset 916 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Changelog.pm

Timestamp:

Nov 29, 2009, 3:12:56 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Improves Debian support by a/ allowing PBDESC to be used in control file with space prepended. b/ prepend 0 to non digit versions such as devel. c/ creating debian pbfilter files for PBDEBSTD and PBDEBCOMP macros used in control.
• Uses pbtag for ebuild and pkg packages
• Improves pb Solaris pkgs
• Improves pb Debian pkgs (only some warnings remaining for lintian)
• Adds a PBSUMMARY macro and use it. Now also generated for newproj.

File:

• devel/pb/lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -48 +48 @@
 Function that generates the changelog used in build files, or for announcements (web, mailing-list, ...)
 
-It takes up to 9 parameters:
-The first parameter is the type of the distribution.
-The second parameter is the package name generated.
-The third parameter is the version of the package.
-The fourth parameter is the tag of the package.
-The fifth parameter is the suffix of the package.
-The sixth parameter is now unused.
-The seventh parameter is the file descriptor on which to write the changelog content.
-The eighth parameter is a flag in the configuration file indicating whether we want changelog expansion or not.
-The nineth parameter is the potential changelog file pbcl.
+It takes 3 parameters:
+The first parameter is the %pb hash containing packge info
+The second parameter is the file descriptor on which to write the changelog content.
+The third parameter is a flag in the configuration file indicating whether we want changelog expansion or not.
 
 =cut
@@ -119 +113 @@
     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";
+            # dpkg-deb doesn't accept non digit versions. 
+            # Prepending 0 in order to make updates easy hopefully
+            $pbver =~ s/^/0/;
+        }
+        print $OUTPUT "$pbrealpkg ($pbver-$pbtag) unstable; urgency=low\n";
+        print $OUTPUT "  * Updated to $pbver\n";
         print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
         }
@@ -154 +148 @@
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
-    #pb_log(2,"**$date**\n";
+    pb_log(3,"**Date:$date**\n");
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    #pb_log(2,"**$ndate**\n";
+    pb_log(3,"**nDate:$ndate**\n");
+
+    pb_log(3,"**Ver:$ver**\n");
+    if ($ver !~ /-/) {
+        if ($first eq 1) {
+            $ver2 = "$ver-$pbtag";
+            $first = 0;
+        } else {
+            $ver2 = "$ver-1";
+        }
+    } else {
+        $ver2 = $ver;
+    }
+    pb_log(3,"**Ver2:$ver2**\n");
 
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
-        if ($ver !~ /-/) {
-            if ($first eq 1) {
-                $ver2 = "$ver-$pbtag";
-                $first=0;
-            } else {
-                $ver2 = "$ver-1";
-            }
-        } else {
-            $ver2 = "$ver";
-        }
         print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
     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";
+        if ($ver2 !~ /^[0-9]/) {
+            # dpkg-deb doesn't accept non digit versions. 
+            # Prepending 0 in order to make updates easy hopefully
+            $ver2 =~ s/^/0/;
+        }
+        print $OUTPUT "$pbrealpkg ($ver2) unstable; urgency=low\n";
         print $OUTPUT "\n";
         }