[Pkg-mozext-commits] [adblock-plus] 131/464: Retire n.n.n+ development build versions - 1.2.3+ is equivalent to 1.2.4pre which is "newer" than 1.2.4a, undesirable

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 2ea1d1c862520649e51027755803b1e82601970d
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Mar 25 08:56:08 2011 +0100

    Retire n.n.n+ development build versions - 1.2.3+ is equivalent to 1.2.4pre which is "newer" than 1.2.4a, undesirable
---
 Packager.pm      | 5 -----
 make_devbuild.pl | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/Packager.pm b/Packager.pm
index dc4a23e..2b149d3 100644
--- a/Packager.pm
+++ b/Packager.pm
@@ -83,11 +83,6 @@ sub readMetadata
   $self->{version} = $self->{settings}{general}{version};
   if (exists $self->{devbuild})
   {
-    unless ($self->{version} =~ /[^\d\.]\d*$/)
-    {
-      $self->{version} .= ".0" while ($self->{version} =~ tr/././ < 2);
-      $self->{version} .= "+";
-    }
     $self->{version} .= "." . $self->{devbuild};
   }
 }
diff --git a/make_devbuild.pl b/make_devbuild.pl
index d9ed02a..1228acb 100644
--- a/make_devbuild.pl
+++ b/make_devbuild.pl
@@ -30,14 +30,6 @@ $pkg->readMetadata('metadata');
 my $baseName = $pkg->{settings}{general}{basename};
 my $version = $pkg->{version};
 
-unless ($version =~ /[^\d\.]\d*$/)
-{
-  # Pad the version with zeroes to get version comparisons
-  # right (1.2+ > 1.2.1 but 1.2.0+ < 1.2.1)
-  $version .= ".0" while ($version =~ tr/././ < 2);
-  $version .= "+";
-}
-
 my $build = `hg id -n`;
 $build =~ s/\D//g;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git