SpamAssassin.pm (Mail-SpamAssassin-3.4.3.tar.bz2) | : | SpamAssassin.pm (Mail-SpamAssassin-3.4.4.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 90 | skipping to change at line 90 | |||
use Mail::SpamAssassin::Util::ScopedTimer; | use Mail::SpamAssassin::Util::ScopedTimer; | |||
use Errno qw(ENOENT EACCES); | use Errno qw(ENOENT EACCES); | |||
use File::Basename; | use File::Basename; | |||
use File::Path; | use File::Path; | |||
use File::Spec 0.8; | use File::Spec 0.8; | |||
use Time::HiRes qw(time); | use Time::HiRes qw(time); | |||
use Cwd; | use Cwd; | |||
use Config; | use Config; | |||
our $VERSION = "3.004003"; # update after release (same format as perl $]) | our $VERSION = "3.004004"; # update after release (same format as perl $]) | |||
#our $IS_DEVEL_BUILD = 1; # 1 for devel build | #our $IS_DEVEL_BUILD = 1; # 1 for devel build | |||
our $IS_DEVEL_BUILD = 0; # 0 for release versions including rc & pre rele ases | our $IS_DEVEL_BUILD = 0; # 0 for release versions including rc & pre rele ases | |||
# Used during the prerelease/release-candidate part of the official release | # Used during the prerelease/release-candidate part of the official release | |||
# process. If you hacked up your SA, you should add a version_tag to your .cf | # process. If you hacked up your SA, you should add a version_tag to your .cf | |||
# files; this variable should not be modified. | # files; this variable should not be modified. | |||
our @EXTRA_VERSION = qw(); | our @EXTRA_VERSION = qw(); | |||
our @ISA = qw(); | our @ISA = qw(); | |||
# SUB_VERSION is now just <yyyy>-<mm>-<dd> | # SUB_VERSION is now just <yyyy>-<mm>-<dd> | |||
our $SUB_VERSION = 'svnunknown'; | our $SUB_VERSION = 'svnunknown'; | |||
if ('$LastChangedDate: 2019-12-06 18:58:14 -0500 (Fri, 06 Dec 2019) $' =~ ':') { | if ('$LastChangedDate: 2020-01-24 21:49:19 -0500 (Fri, 24 Jan 2020) $' =~ ':') { | |||
# Subversion keyword "$LastChangedDate: 2019-12-06 18:58:14 -0500 (Fri, 06 Dec | # Subversion keyword "$LastChangedDate: 2020-01-24 21:49:19 -0500 (Fri, 24 Jan | |||
2019) $" has been successfully expanded. | 2020) $" has been successfully expanded. | |||
# Doesn't happen with automated launchpad builds: | # Doesn't happen with automated launchpad builds: | |||
# https://bugs.launchpad.net/launchpad/+bug/780916 | # https://bugs.launchpad.net/launchpad/+bug/780916 | |||
$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2019-12-06 18:58:14 -0500 (Fri, 06 Dec 2019) $ updated by SVN'))[1]; | $SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2020-01-24 21:49:19 -0500 (Fri, 24 Jan 2020) $ updated by SVN'))[1]; | |||
} | } | |||
if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) { | if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) { | |||
if ('$LastChangedRevision: 1870940 $' =~ ':') { | if ('$LastChangedRevision: 1873123 $' =~ ':') { | |||
# Subversion keyword "$LastChangedRevision: 1870940 $" has been successfully | # Subversion keyword "$LastChangedRevision: 1873123 $" has been successfully | |||
expanded. | expanded. | |||
push(@EXTRA_VERSION, ('r' . qw{$LastChangedRevision: 1870940 $ updated by SV | push(@EXTRA_VERSION, ('r' . qw{$LastChangedRevision: 1873123 $ updated by SV | |||
N}[1])); | N}[1])); | |||
} else { | } else { | |||
push(@EXTRA_VERSION, ('r' . 'svnunknown')); | push(@EXTRA_VERSION, ('r' . 'svnunknown')); | |||
} | } | |||
} | } | |||
sub Version { | sub Version { | |||
$VERSION =~ /^(\d+)\.(\d\d\d)(\d\d\d)$/; | $VERSION =~ /^(\d+)\.(\d\d\d)(\d\d\d)$/; | |||
return join('-', sprintf("%d.%d.%d", $1, $2, $3), @EXTRA_VERSION); | return join('-', sprintf("%d.%d.%d", $1, $2, $3), @EXTRA_VERSION); | |||
} | } | |||
End of changes. 4 change blocks. | ||||
10 lines changed or deleted | 10 lines changed or added |